Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
58c62971
Commit
58c62971
authored
Feb 26, 2011
by
James Goppert
Browse files
Fixed osg cmake error.
parent
e32dc6e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
58c62971
...
...
@@ -121,8 +121,8 @@ if (UNIX)
find_package
(
Flite
)
endif
(
UNIX
)
find_package
(
OpenGL REQUIRED
)
find_package
(
OpenSceneGraph
2.9.9
)
#
COMPONENTS osgGA osgDB osgUtil osgViewer)
set
(
OpenSceneGraph
_FIND_QUIETLY FALSE
)
find_package
(
OpenSceneGraph 2.9.9
COMPONENTS osgGA osgDB osgUtil osgViewer
)
find_or_build_from_source
(
MAVLINK thirdParty/mavlink FOUND_GIT_REPO
)
# build libraries from source if not found on system
...
...
@@ -196,13 +196,12 @@ else()
message
(
STATUS
"
\t\t
MAVLINK
\t
NO"
)
endif
()
message
(
STATUS
"OSG_FOUND:
${
OPENSCENEGRAPH_FOUND
}
"
)
if
(
OPENSCENEGRAPH_FOUND
)
if
(
${
OSG_LIBRARY
}
STREQUAL
"OSG_LIBRARY-NOTFOUND"
)
message
(
STATUS
"
\t\t
OpenSceneGraph
\t
NO"
)
else
()
message
(
STATUS
"
\t\t
OpenSceneGraph
\t
YES"
)
list
(
APPEND qgroundcontrolIncludes
${
OPENSCENEGRAPH_INCLUDE_DIRS
}
)
list
(
APPEND qgroundcontrolLibs
${
OPENSCENEGRAPH_LIBRARIES
}
)
else
()
message
(
STATUS
"
\t\t
OpenSceneGraph
\t\t
NO"
)
endif
()
if
(
QT4_FOUND
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment