Commit e729867f authored by James Goppert's avatar James Goppert

Cmake bug fix.

parent ec2f7ad6
...@@ -123,8 +123,13 @@ if (UNIX) ...@@ -123,8 +123,13 @@ if (UNIX)
find_package(Flite) find_package(Flite)
endif(UNIX) endif(UNIX)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
set(OpenSceneGraph_FIND_QUIETLY FALSE)
find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer) find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer)
if ("OSG_LIBRARY" STREQUAL "${OSG_LIBRARY}")
set(OPENSCENEGRAPH_FOUND FALSE)
else()
set(OPENSCENEGRAPH_FOUND TRUE)
endif()
find_or_build_from_source(MAVLINK thirdParty/mavlink FOUND_GIT_REPO) find_or_build_from_source(MAVLINK thirdParty/mavlink FOUND_GIT_REPO)
# build libraries from source if not found on system # build libraries from source if not found on system
...@@ -191,63 +196,49 @@ message(STATUS "\tDEPENDENCY\t\tFOUND") ...@@ -191,63 +196,49 @@ message(STATUS "\tDEPENDENCY\t\tFOUND")
message(STATUS "=======================================") message(STATUS "=======================================")
# common dependencies # common dependencies
message(STATUS "\t\tMAVLINK\t\t${MAVLINK_FOUND}")
if (MAVLINK_FOUND) if (MAVLINK_FOUND)
message(STATUS "\t\tMAVLINK\t\tYES")
list(APPEND qgroundcontrolIncludes ${MAVLINK_INCLUDE_DIRS}) list(APPEND qgroundcontrolIncludes ${MAVLINK_INCLUDE_DIRS})
else() endif()
message(STATUS "\t\tMAVLINK\tNO")
endif ()
message(STATUS "\t\tOpenSceneGraph\t${OPENSCENEGRAPH_FOUND}")
if (OPENSCENEGRAPH_FOUND) if (OPENSCENEGRAPH_FOUND)
message(STATUS "\t\tOpenSceneGraph\tNO")
else()
message(STATUS "\t\tOpenSceneGraph\tYES")
list(APPEND qgroundcontrolIncludes ${OPENSCENEGRAPH_INCLUDE_DIRS}) list(APPEND qgroundcontrolIncludes ${OPENSCENEGRAPH_INCLUDE_DIRS})
list(APPEND qgroundcontrolLibs ${OPENSCENEGRAPH_LIBRARIES}) list(APPEND qgroundcontrolLibs ${OPENSCENEGRAPH_LIBRARIES})
endif () endif()
message(STATUS "\t\tQT4\t\t${QT4_FOUND}")
if (QT4_FOUND) if (QT4_FOUND)
message(STATUS "\t\tQT4\t\tYES")
list(APPEND qgroundcontrolIncludes ${QT_INCLUDE_DIRS}) list(APPEND qgroundcontrolIncludes ${QT_INCLUDE_DIRS})
list(APPEND qgroundcontrolLibs ${QT_LIBRARIES}) list(APPEND qgroundcontrolLibs ${QT_LIBRARIES})
else() endif()
message(STATUS "\t\tQT4\t\tNO")
endif ()
message(STATUS "\t\tPHONON\t\t${PHONON_FOUND}")
if (PHONON_FOUND) if (PHONON_FOUND)
message(STATUS "\t\tPHONON\t\tYES")
list(APPEND qgroundcontrolIncludes ${PHONON_INCLUDES}) list(APPEND qgroundcontrolIncludes ${PHONON_INCLUDES})
list(APPEND qgroundcontrolLibs ${PHONON_LIBS}) list(APPEND qgroundcontrolLibs ${PHONON_LIBS})
else() endif()
message(STATUS "\t\tPHONON\t\tNO")
endif ()
message(STATUS "\t\tSDL\t\t${SDL_FOUND}")
if (SDL_FOUND) if (SDL_FOUND)
message(STATUS "\t\tSDL\t\tYES")
list(APPEND qgroundcontrolIncludes ${SDL_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${SDL_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${SDL_LIBRARY}) list(APPEND qgroundcontrolLibs ${SDL_LIBRARY})
else() endif()
message(STATUS "\t\tSDL\t\tNO")
endif ()
message(STATUS "\t\tOPENGL\t\t${OPENGL_FOUND}")
if (OPENGL_FOUND) if (OPENGL_FOUND)
message(STATUS "\t\tOPENGL\t\tYES")
list(APPEND qgroundcontrolIncludes ${OPENGL_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${OPENGL_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${OPENGL_LIBRARIES}) list(APPEND qgroundcontrolLibs ${OPENGL_LIBRARIES})
else()
message(STATUS "\t\tOPENGL\t\tNO")
endif() endif()
# unix only dependencies # unix only dependencies
if (UNIX) if (UNIX)
message(STATUS "\t\tFLITE\t\t${FLITE_FOUND}")
if (FLITE_FOUND) if (FLITE_FOUND)
message(STATUS "\t\tFLITE\t\tYES")
list(APPEND qgroundcontrolIncludes ${FLITE_INCLUDE_DIR}) list(APPEND qgroundcontrolIncludes ${FLITE_INCLUDE_DIR})
list(APPEND qgroundcontrolLibs ${FLITE_LIBRARIES}) list(APPEND qgroundcontrolLibs ${FLITE_LIBRARIES})
else()
message(STATUS "\t\tFLITE\t\tNO")
endif () endif ()
endif(UNIX) endif()
# set include directories # set include directories
include_directories(${qgroundcontrolIncludes}) include_directories(${qgroundcontrolIncludes})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment