Update PyQtMacros module to handle removal of name option from pyrcc5

mblesius · Nov 5, 2017 · ff2a53c · ff2a53c
1 parent d8b671d
commit ff2a53c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
@@ -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})