sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update PyQtMacros module to handle removal of name option from pyrcc5

Browse Source
This commit is contained in:
Larry Shaffer 2017-11-05 11:24:59 -07:00
parent d8b671d9ce
commit ff2a53c584
No known key found for this signature in database
GPG Key ID: E113FDFD0FBCEC20
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/PyQtMacros.cmake
View File

@ -87,8 +87,13 @@ MACRO (PYQT_ADD_RESOURCES outfiles )
ENDIF(NOT _ABS_PATH_INDICATOR)
SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
ENDFOREACH(_RC_FILE)
SET(_name_opt)
IF(PYQT5_VERSION_STR VERSION_LESS 5.9.1)
# option removed in PyQt5 >= 5.9.1
SET(_name_opt -name ${outfile})
ENDIF()
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYRCC_PROGRAM} -name ${outfile} -o ${outfile} ${infile}
COMMAND ${PYRCC_PROGRAM} ${_name_opt} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_RC_DEPENDS})
SET(${outfiles} ${${outfiles}} ${outfile})