sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

[RPM] Update the lib64 PyQtMacros.cmake patch

Browse Source
This commit is contained in:
Daniele Viganò 2019-08-06 16:00:09 +02:00 committed by Jürgen Fischer
parent cf6faa410d
commit 8d44f84cd0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm/sources/qgis-lib64.patch
View File

@ -1,13 +1,12 @@
diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64 diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
--- cmake/PyQtMacros.cmake 2017-09-29 17:55:02.000000000 +0200 --- cmake/PyQtMacros.cmake 2019-08-06 15:58:04.255845979 +0200
+++ cmake/PyQtMacros.cmake.lib64 2017-09-30 18:32:30.277970717 +0200 +++ cmake/PyQtMacros.cmake.lib64 2019-08-06 15:58:52.428790521 +0200
@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles ) @@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
ELSE(WIN32) ELSE(CMAKE_HOST_WIN32)
# TODO osx # TODO osx
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh") 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")
+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}") + SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
ENDIF(WIN32) ENDIF(CMAKE_HOST_WIN32)
FOREACH(it ${ARGN}) FOREACH(it ${ARGN})