Commit 58c62971 authored by James Goppert's avatar James Goppert

Fixed osg cmake error.

parent e32dc6e0
...@@ -121,8 +121,8 @@ if (UNIX) ...@@ -121,8 +121,8 @@ if (UNIX)
find_package(Flite) find_package(Flite)
endif(UNIX) endif(UNIX)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(OpenSceneGraph 2.9.9) set(OpenSceneGraph_FIND_QUIETLY FALSE)
#COMPONENTS osgGA osgDB osgUtil osgViewer) find_package(OpenSceneGraph 2.9.9 COMPONENTS osgGA osgDB osgUtil osgViewer)
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
...@@ -196,13 +196,12 @@ else() ...@@ -196,13 +196,12 @@ else()
message(STATUS "\t\tMAVLINK\tNO") message(STATUS "\t\tMAVLINK\tNO")
endif () endif ()
message(STATUS "OSG_FOUND: ${OPENSCENEGRAPH_FOUND}") if (${OSG_LIBRARY} STREQUAL "OSG_LIBRARY-NOTFOUND")
if (OPENSCENEGRAPH_FOUND) message(STATUS "\t\tOpenSceneGraph\tNO")
else()
message(STATUS "\t\tOpenSceneGraph\tYES") 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})
else()
message(STATUS "\t\tOpenSceneGraph\t\tNO")
endif () endif ()
if (QT4_FOUND) if (QT4_FOUND)
......
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