diff --git a/rpm/sources/qgis-lib64.patch b/rpm/sources/qgis-lib64.patch index 125d6edef90..73a7dd3a2d6 100644 --- a/rpm/sources/qgis-lib64.patch +++ b/rpm/sources/qgis-lib64.patch @@ -1,13 +1,12 @@ - diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64 ---- cmake/PyQtMacros.cmake 2017-09-29 17:55:02.000000000 +0200 -+++ cmake/PyQtMacros.cmake.lib64 2017-09-30 18:32:30.277970717 +0200 +--- cmake/PyQtMacros.cmake 2019-08-06 15:58:04.255845979 +0200 ++++ cmake/PyQtMacros.cmake.lib64 2019-08-06 15:58:52.428790521 +0200 @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) - ELSE(WIN32) + ELSE(CMAKE_HOST_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) + ENDIF(CMAKE_HOST_WIN32) FOREACH(it ${ARGN})