rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

OP-1666 deb tidy and OP-1663: move Qt inside OP

Browse Source 
lib dir to avoid conflict and match Qt dir structure so their rpath is correct. part 2 (fix part 1)
This commit is contained in:
James Duley 2015-01-10 11:17:28 +13:00
parent 95fe38143f
commit d1229adc37
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ground/openpilotgcs/openpilotgcs.pri
View File

@ -96,7 +96,15 @@ macx {
copydata = 1 copydata = 1
copyqt = 1 copyqt = 1
} else { } else {
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins
GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME
GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
GCS_DATA_BASENAME = share/openpilotgcs
GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1 !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
win32 { win32 {
SDL_DIR = $$(SDL_DIR) SDL_DIR = $$(SDL_DIR)
isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15 isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15
@ -112,7 +120,7 @@ macx {
copyqt = $$copydata copyqt = $$copydata
} else { } else {
GCS_APP_TARGET = openpilotgcs GCS_APP_TARGET = openpilotgcs
GCS_QT_BASEPATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5 GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5
GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib
GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins
GCS_QT_QML_PATH = $$GCS_QT_BASEPATH/qml GCS_QT_QML_PATH = $$GCS_QT_BASEPATH/qml
@ -124,12 +132,6 @@ macx {
copyqt = 0 copyqt = 0
} }
} }
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins
GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME
GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
GCS_DATA_BASENAME = share/openpilotgcs
GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc
} }