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
b72ed549
Commit
b72ed549
authored
Feb 21, 2011
by
James Goppert
Browse files
Some minor cmake fixes.
parent
571c03fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b72ed549
...
...
@@ -121,9 +121,9 @@ find_package(Qt4 COMPONENTS QtGui QtCore QtNetwork QtOpenGL QtSVG QtXML QtPhonon
set
(
PHONON_FIND_QUIETLY FALSE
)
find_package
(
Phonon
)
find_package
(
SDL REQUIRED
)
if
(
LINU
X
)
if
(
UNI
X
)
find_package
(
Flite
)
endif
(
LINU
X
)
endif
(
UNI
X
)
find_package
(
OpenGL REQUIRED
)
find_package
(
OpenSceneGraph 2.8.3 COMPONENTS osgGA osgDB osgUtil osgViewer
)
find_or_build_from_source
(
MAVLINK thirdParty/mavlink FOUND_GIT_REPO
)
...
...
@@ -228,15 +228,15 @@ else()
message
(
STATUS
"
\t\t
OPENGL
\t\t
NO"
)
endif
(
OPENGL_FOUND
)
#
linu
x only dependencies
if
(
LINU
X
)
#
uni
x only dependencies
if
(
UNI
X
)
if
(
FLITE_FOUND
)
message
(
STATUS
"
\t\t
FLITE
\t\t
YES"
)
list
(
APPEND qgroundcontrolIncludes
${
FLITE_INCLUDE_DIR
}
)
else
()
message
(
STATUS
"
\t\t
FLITE
\t\t
NO"
)
endif
(
FLITE_FOUND
)
endif
(
LINU
X
)
endif
(
UNI
X
)
# set include directories
include_directories
(
${
qgroundcontrolIncludes
}
)
...
...
@@ -354,14 +354,15 @@ set (qgroundcontrolHdrs
# r !grep -Rl Q_OBJECT src | grep "^.*\.[h|hpp]$" | sed "s/^/\t/g"
set
(
qgroundcontrolMocSrc
src/Core.h
src/uas/UASManager.h
src/uas/UASWaypointManager.h
src/uas/UASInterface.h
src/uas/PxQuadMAV.h
src/uas/QGCMAVLinkUASFactory.h
src/uas/SlugsMAV.h
src/uas/UAS.h
src/uas/ArduPilotMegaMAV.h
src/uas/ArduPilotMegaMAV.h
src/uas/PxQuadMAV.h
src/uas/QGCMAVLinkUASFactory.h
src/uas/QGCUASParamManager.h
src/uas/SlugsMAV.h
src/uas/UAS.h
src/uas/UASInterface.h
src/uas/UASManager.h
src/uas/UASWaypointManager.h
src/Waypoint.h
src/LogCompressor.h
src/GAudioOutput.h
...
...
@@ -476,6 +477,7 @@ set (qgroundcontrolSrc
src/uas/ArduPilotMegaMAV.cc
src/uas/PxQuadMAV.cc
src/uas/QGCMAVLinkUASFactory.cc
src/uas/QGCUASParamManager.cc
src/uas/SlugsMAV.cc
src/uas/UAS.cc
src/uas/UASManager.cc
...
...
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