From 65393eec964debe69d82ae5cf1c38c97d90c62df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Tue, 27 Sep 2016 10:40:27 +0200 Subject: [PATCH] Add patch backported from master --- qgis-lib64.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 qgis-lib64.patch diff --git a/qgis-lib64.patch b/qgis-lib64.patch new file mode 100644 index 0000000..493fe69 --- /dev/null +++ b/qgis-lib64.patch @@ -0,0 +1,13 @@ +diff -up qgis-2.16.2/CMakeLists.txt.lib64 qgis-2.16.2/CMakeLists.txt +diff -up qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 qgis-2.16.2/cmake/PyQtMacros.cmake +--- qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 2016-08-26 05:58:37.000000000 -0600 ++++ qgis-2.16.2/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 +@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) + ELSE(WIN32) + # TODO osx + SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") +- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib") ++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") + ENDIF(WIN32) + + FOREACH(it ${ARGN})