diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-09 20:27:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-09 20:27:55 (GMT) |
| commit | 5965ff51127c7baaa23b06df510c8adcc5435880 (patch) | |
| tree | 2b6db55926bc2698873f7766b19eca2897a53dc3 /Modules | |
| parent | b5a46cab851fd0fce570d168f81ae0adfa32b33d (diff) | |
| parent | de0485459c448fe7ef4b8955d34d8313449f9337 (diff) | |
| download | CMake-5965ff51127c7baaa23b06df510c8adcc5435880.zip CMake-5965ff51127c7baaa23b06df510c8adcc5435880.tar.gz CMake-5965ff51127c7baaa23b06df510c8adcc5435880.tar.bz2 | |
Merge topic 'qt4-resources-bug5952'
de04854 Force cmake to run again when qrc dependency scanning needs to happen.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Qt4Macros.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index 700d3a2..df07d25 100644 --- a/Modules/Qt4Macros.cmake +++ b/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) |