|
|
52294d0 |
diff -rupN qgis-2.18.25/cmake/PyQtMacros.cmake qgis-2.18.25-new/cmake/PyQtMacros.cmake
|
|
|
52294d0 |
--- qgis-2.18.25/cmake/PyQtMacros.cmake 2018-10-26 13:59:08.000000000 +0200
|
|
|
52294d0 |
+++ qgis-2.18.25-new/cmake/PyQtMacros.cmake 2018-11-14 00:15:36.247074662 +0100
|
|
Orion Poplawski |
a802ec0 |
@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
|
|
Orion Poplawski |
a802ec0 |
ELSE(WIN32)
|
|
Orion Poplawski |
a802ec0 |
# TODO osx
|
|
Orion Poplawski |
a802ec0 |
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
|
|
Orion Poplawski |
a802ec0 |
- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
|
|
Orion Poplawski |
a802ec0 |
+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
|
|
Orion Poplawski |
a802ec0 |
ENDIF(WIN32)
|
|
Orion Poplawski |
a802ec0 |
|
|
Orion Poplawski |
a802ec0 |
FOREACH(it ${ARGN})
|