diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-10-15 22:46:39 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-10-15 22:46:39 (GMT) |
| commit | de0485459c448fe7ef4b8955d34d8313449f9337 (patch) | |
| tree | a3271971e78f267a5ceb8682154dcdb10bb7a905 /Modules | |
| parent | 57c04db124f71f608522a8631feb4b9fcb67e81f (diff) | |
| download | CMake-de0485459c448fe7ef4b8955d34d8313449f9337.zip CMake-de0485459c448fe7ef4b8955d34d8313449f9337.tar.gz CMake-de0485459c448fe7ef4b8955d34d8313449f9337.tar.bz2 | |
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) |