rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

Merge branch 'copy' into next

Browse Source
This commit is contained in:
Fredrik Larson 2014-08-21 17:45:14 +10:00
commit 2015968911
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/copydata.pro
View File

@ -3,7 +3,7 @@ include(openpilotgcs.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
# Copy Qt runtime libraries into the build directory (to run or package) # Copy Qt runtime libraries into the build directory (to run or package)
equals(copydata, 1) { equals(copyqt, 1) {
GCS_LIBRARY_PATH GCS_LIBRARY_PATH

11
ground/openpilotgcs/openpilotgcs.pri
View File

@ -83,16 +83,26 @@ macx {
GCS_DATA_BASENAME = Resources GCS_DATA_BASENAME = Resources
GCS_DOC_PATH = $$GCS_DATA_PATH/doc GCS_DOC_PATH = $$GCS_DATA_PATH/doc
copydata = 1 copydata = 1
copyqt = 1
} else { } else {
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
win32 { win32 {
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
GCS_APP_TARGET = openpilotgcs GCS_APP_TARGET = openpilotgcs
copyqt = $$copydata
} else { } else {
GCS_APP_WRAPPER = openpilotgcs GCS_APP_WRAPPER = openpilotgcs
GCS_APP_TARGET = openpilotgcs.bin GCS_APP_TARGET = openpilotgcs.bin
GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5 GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
lib_dir_is_in_tools = $$[QT_INSTALL_LIBS]
lib_dir_is_in_tools ~= s,$$(TOOLS_DIR)*,TRUE
equals(lib_dir_is_in_tools, "TRUE") {
copyqt = 1
} else {
copyqt = 0
}
} }
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins
@ -100,7 +110,6 @@ macx {
GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
GCS_DATA_BASENAME = share/openpilotgcs GCS_DATA_BASENAME = share/openpilotgcs
GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
} }