diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-06 17:48:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-06 17:48:40 (GMT) |
| commit | 58557486db5343f7d63f709177be980ad8ced590 (patch) | |
| tree | 56eb68ad32ab52605fa183b9aeb67b19fb3c1887 /Modules | |
| parent | 4345cf36ac9d0f8586839a390ee7cba9be88e74b (diff) | |
| parent | 17c31b8bd4aa56d924b94cf41b9c4a6a90d23264 (diff) | |
| download | CMake-58557486db5343f7d63f709177be980ad8ced590.zip CMake-58557486db5343f7d63f709177be980ad8ced590.tar.gz CMake-58557486db5343f7d63f709177be980ad8ced590.tar.bz2 | |
Merge topic 'dont-rewrite-moc-parameter-file'
17c31b8b Qt4: Extend the Qt4Targets test to cover dir and target moc parameters.
6a5bd7f0 Qt4: write moc parameter file only when content has changed
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Qt4Macros.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index b1b12d6..8c4daac 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -135,7 +135,9 @@ function (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target set(targetincludes) set(targetdefines) else() - file(WRITE ${_moc_parameters_file} "${_moc_parameters}\n") + set(CMAKE_CONFIGURABLE_FILE_CONTENT "${_moc_parameters}") + configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in" + "${_moc_parameters_file}" @ONLY) endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) |