Commit 694091f9 authored by Don Gagne's avatar Don Gagne

Fixed broken UnitTest build

Build files were broken for unit test. Seems to difficult to try to kep
qgroundcontrol.pro and qgcunittest.pro in sync with each other. Instead
I made qgcunittest.pro just include qgroundcontrol.pro. This required
some tweaks to allow TARGET to be set from the outside as well as to
leave out main.cc. Also needed to modify qgroundcontrol.pri to use
TARGET instead of hardcoding app name. This way it can build either
qgroundcontrol.pp or qgcunittest.app. At this point only works on osx.
parent 2f1d35c5
This diff is collapsed.
This diff is collapsed.
......@@ -32,8 +32,15 @@ QT += network \
sql \
declarative
TEMPLATE = app
TARGET = qgroundcontrol
# Setting this define allows you to include this .pro file in another such that
# you can set your own TARGET and main() function. This is used by the unit test
# build files to build unit test using all built parts of QGCS except for main.
isEmpty(QGCS_UNITTEST_OVERRIDE) {
TEMPLATE = app
TARGET = qgroundcontrol
SOURCES += src/main.cc
}
BASEDIR = $${IN_PWD}
linux-g++|linux-g++-64{
debug {
......@@ -556,7 +563,7 @@ contains(DEPENDENCIES_PRESENT, libfreenect) {
# Enable only if libfreenect is available
HEADERS += src/input/Freenect.h
}
SOURCES += src/main.cc \
SOURCES += \
src/QGCCore.cc \
src/uas/UASManager.cc \
src/uas/UAS.cc \
......
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