a802ec096c
- Add patch to fix build on 64-bit machines - Drop unused cmake options - Move %grass_version macro to grass-devel, make it an install requirement
14 lines
634 B
Diff
14 lines
634 B
Diff
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})
|