mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-23 00:02:38 -05:00
85d543a739
We had a confusing and unpredictable mix of script names with - vs _, e.g. scripts/prepare-commit.sh vs scripts/sipify_all.sh This unifies with the preferred _ convention for script file names
13 lines
539 B
Diff
13 lines
539 B
Diff
diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
|
|
--- 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(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(CMAKE_HOST_WIN32)
|
|
|
|
FOREACH(it ${ARGN})
|