rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/parched/OP-1461_fix_copyqt_logic' into next

Browse Source
This commit is contained in:
Fredrik Larson 2014-08-28 09:59:30 +10:00
commit 6e86b3f157
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -740,6 +740,9 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
export PACKAGE_NAME := OpenPilot
export PACKAGE_SEP := -
# Copy the Qt libraries regardless whether the building machine needs them to run GCS
export FORCE_COPY_QT := true
# We can only package release builds
ifneq ($(GCS_BUILD_CONF),release)
$(error Packaging is currently supported for release builds only)

12
ground/openpilotgcs/openpilotgcs.pri
View File

@ -96,13 +96,17 @@ macx {
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_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") {
TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
copyqt = 1
} else {
copyqt = 0
copyqt = 0
}
FORCE_COPY_QT = $$(FORCE_COPY_QT)
!isEmpty(FORCE_COPY_QT):copyqt = 1
}
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins