diff --git a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake index d1c1b20622..7a3edad279 100644 --- a/cmake/PyQtMacros.cmake +++ b/cmake/PyQtMacros.cmake @@ -80,7 +80,7 @@ MACRO (PYQT_ADD_RESOURCES outfiles ) SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") ENDFOREACH(_RC_FILE) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND ${PYRCC4_PROGRAM} -name ${outfile} -o ${outfile} ${infile} + COMMAND ${PYRCC4_PROGRAM} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} DEPENDS ${_RC_DEPENDS}) SET(${outfiles} ${${outfiles}} ${outfile}) diff --git a/python/plugins/GdalTools/CMakeLists.txt b/python/plugins/GdalTools/CMakeLists.txt index f0fc753073..728670a727 100644 --- a/python/plugins/GdalTools/CMakeLists.txt +++ b/python/plugins/GdalTools/CMakeLists.txt @@ -2,8 +2,8 @@ FILE(GLOB INSTALLER_FILES *.py) SET(INSTALLER_FILES ${INSTALLER_FILES}) FILE(GLOB UI_FILES *.ui) -PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) -PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc) +PYQT_WRAP_UI(PYUI_FILES ${UI_FILES}) +PYQT_ADD_RESOURCES(PYRC_FILES resources.qrc) #ADD_CUSTOM_TARGET(gdaltools ALL DEPENDS ${PYUI_FILES} ${PYRC_FILES}) SET(INSTALLER_FILES ${INSTALLER_FILES} ${PYUI_FILES} ${PYRC_FILES}) diff --git a/python/plugins/GdalTools/tools/CMakeLists.txt b/python/plugins/GdalTools/tools/CMakeLists.txt index 6f714b0582..59409186ef 100644 --- a/python/plugins/GdalTools/tools/CMakeLists.txt +++ b/python/plugins/GdalTools/tools/CMakeLists.txt @@ -2,7 +2,7 @@ FILE(GLOB PY_FILES *.py) FILE(GLOB UI_FILES *.ui) FILE(GLOB COLOR_CONFIG_FILES terrain.txt) -PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) +PYQT_WRAP_UI(PYUI_FILES ${UI_FILES}) PLUGIN_INSTALL(GdalTools tools ${PY_FILES} ${PYUI_FILES} ${COLOR_CONFIG_FILES})