From d43797628762c75e35d2449ff29623e3377b33f7 Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 3 Jul 2014 19:40:41 +1200 Subject: [PATCH 1/4] removed so version number from linux icu libs --- ground/openpilotgcs/copydata.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro index a60b7b8a6..2805a26f6 100644 --- a/ground/openpilotgcs/copydata.pro +++ b/ground/openpilotgcs/copydata.pro @@ -30,9 +30,9 @@ GCS_LIBRARY_PATH libQt5Qml.so.5 \ libQt5DBus.so.5 \ libQt5QuickParticles.so.5 \ - libicui18n.so.51 \ - libicuuc.so.51 \ - libicudata.so.51 \ + libicui18n.so \ + libicuuc.so \ + libicudata.so \ libqgsttools_p.so.1 data_copy.commands += -@$(MKDIR) $$targetPath(\"$$GCS_QT_LIBRARY_PATH\") $$addNewline() From 90b84b210e616d2ec786875da9960e21a6b752dd Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 5 Jul 2014 23:30:40 +1200 Subject: [PATCH 2/4] Revert "removed so version number from linux icu libs" it breaks the build with qt_sdk_install This reverts commit d43797628762c75e35d2449ff29623e3377b33f7. --- ground/openpilotgcs/copydata.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro index 2805a26f6..a60b7b8a6 100644 --- a/ground/openpilotgcs/copydata.pro +++ b/ground/openpilotgcs/copydata.pro @@ -30,9 +30,9 @@ GCS_LIBRARY_PATH libQt5Qml.so.5 \ libQt5DBus.so.5 \ libQt5QuickParticles.so.5 \ - libicui18n.so \ - libicuuc.so \ - libicudata.so \ + libicui18n.so.51 \ + libicuuc.so.51 \ + libicudata.so.51 \ libqgsttools_p.so.1 data_copy.commands += -@$(MKDIR) $$targetPath(\"$$GCS_QT_LIBRARY_PATH\") $$addNewline() From 95676043d7e7dbf78c3fbab0beb1bb09c24d16e5 Mon Sep 17 00:00:00 2001 From: James Duley Date: Sun, 6 Jul 2014 18:55:54 +1200 Subject: [PATCH 3/4] on linux check whether QT_INSTALL_LIBS are /usr/lib/* set copyqt to 0 if that is the case --- ground/openpilotgcs/copydata.pro | 2 +- ground/openpilotgcs/openpilotgcs.pri | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro index a60b7b8a6..b277b0f95 100644 --- a/ground/openpilotgcs/copydata.pro +++ b/ground/openpilotgcs/copydata.pro @@ -3,7 +3,7 @@ include(openpilotgcs.pri) TEMPLATE = subdirs # Copy Qt runtime libraries into the build directory (to run or package) -equals(copydata, 1) { +equals(copyqt, 1) { GCS_LIBRARY_PATH diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index 31c0ed454..d8c392b9c 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -83,16 +83,26 @@ macx { GCS_DATA_BASENAME = Resources GCS_DOC_PATH = $$GCS_DATA_PATH/doc copydata = 1 + copyqt = 1 } else { + !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1 win32 { contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 GCS_APP_TARGET = openpilotgcs + copyqt = $$copydata } else { GCS_APP_WRAPPER = openpilotgcs GCS_APP_TARGET = openpilotgcs.bin 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 = $$[QT_INSTALL_LIBS] + lib_dir ~= s,/usr/lib/*,/usr/lib + equals(lib_dir, "/usr/lib") { + copyqt = 0 + } else { + copyqt = 1 + } } GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins @@ -100,7 +110,6 @@ macx { 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 } From 41fdf4e81f778452620810f7ba87d3bda17ed212 Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 21 Aug 2014 08:49:39 +1200 Subject: [PATCH 4/4] OP-1338 changed to check if qt in tools --- ground/openpilotgcs/openpilotgcs.pri | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index d8c392b9c..fd97c3c96 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -96,12 +96,12 @@ 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 = $$[QT_INSTALL_LIBS] - lib_dir ~= s,/usr/lib/*,/usr/lib - equals(lib_dir, "/usr/lib") { - copyqt = 0 - } else { + 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