diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-03-04 10:03:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-03-21 10:14:41 (GMT) |
| commit | 734df96f5ad3d47b3c7825715f0b524292aa6ede (patch) | |
| tree | 8112056a1aa1461ee85c1952d3f04efa7927a90a /Modules/Qt4Macros.cmake | |
| parent | 0f79dab48bf17e867fe19a7b7140fa7513f4b72d (diff) | |
| download | CMake-734df96f5ad3d47b3c7825715f0b524292aa6ede.zip CMake-734df96f5ad3d47b3c7825715f0b524292aa6ede.tar.gz CMake-734df96f5ad3d47b3c7825715f0b524292aa6ede.tar.bz2 | |
Qt4: Fix moc command dependencies for incremental build.
Since commit v2.8.12~327^2 (Qt4Macros: Allow specifying a TARGET
in invokations of macros., 2013-02-26), a parameters file is
populated with moc arguments at generate-time.
When the compile definitions or include directories change, the
parameters file is updated but moc is not re-run in response.
Fix that by making the moc invocation depend on the parameters file.
Reported-At: https://bugreports.qt-project.org/browse/QTBUG-36970
Diffstat (limited to 'Modules/Qt4Macros.cmake')
| -rw-r--r-- | Modules/Qt4Macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index 8baf896..aca8996 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -141,7 +141,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target) set(_moc_extra_parameters_file @${_moc_parameters_file}) add_custom_command(OUTPUT ${outfile} COMMAND Qt4::moc ${_moc_extra_parameters_file} - DEPENDS ${infile} + DEPENDS ${infile} ${_moc_parameters_file} ${_moc_working_dir} VERBATIM) endmacro () |