mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-18 08:54:15 +01:00
Merge remote-tracking branch 'origin/parched/OP-1463_allow_for_alternative_OPENPILOT_TOOLS_DIR' into next
This commit is contained in:
commit
353e3ec0a8
@ -97,7 +97,8 @@ macx {
|
||||
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
|
||||
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
|
||||
|
||||
TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
|
||||
TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
|
||||
isEmpty(TOOLS_DIR):TOOLS_DIR = $$clean_path($$GCS_SOURCE_TREE/../../tools)
|
||||
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
|
||||
equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
|
||||
copyqt = 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user