Browse Source

Force cmake to run again when qrc dependency scanning needs to happen.

Clinton Stimpson 15 years ago
parent
commit
de0485459c
1 changed files with 6 additions and 1 deletions
  1. 6 1
      Modules/Qt4Macros.cmake

+ 6 - 1
Modules/Qt4Macros.cmake

@@ -196,11 +196,16 @@ MACRO (QT4_ADD_RESOURCES outfiles )
       ENDIF(NOT IS_ABSOLUTE "${_RC_FILE}")
       SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
     ENDFOREACH(_RC_FILE)
+    # Since this cmake macro is doing the dependency scanning for these files,
+    # let's make a configured file and add it as a dependency so cmake is run
+    # again when dependencies need to be recomputed.
+    QT4_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends)
+    CONFIGURE_FILE("${infile}" "${out_depends}" COPY_ONLY)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
       COMMAND ${QT_RCC_EXECUTABLE}
       ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
       MAIN_DEPENDENCY ${infile}
-      DEPENDS ${_RC_DEPENDS})
+      DEPENDS ${_RC_DEPENDS} "${out_depends}")
     SET(${outfiles} ${${outfiles}} ${outfile})
   ENDFOREACH (it)