diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-03 14:08:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-03 14:08:35 (GMT) |
| commit | 6aa2d4773701d5b491c44e2c0eda202b46b36521 (patch) | |
| tree | b6522a78a9e58e57bb3d3cf592d178b5aa691f24 /Modules | |
| parent | 44853be608a18c94a1ce4000446ec7f29b8f0ee3 (diff) | |
| parent | 1531df2b866df9aa52dc54219a4552e94f47b622 (diff) | |
| download | CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.zip CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.gz CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.bz2 | |
Merge topic 'fix-configure_file-COPYONLY'
1531df2b configure_file: Warn about unknown arguments
4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY
bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY
e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
Diffstat (limited to 'Modules')
| -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 8c4daac..6516b0a 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -232,7 +232,7 @@ macro (QT4_ADD_RESOURCES outfiles ) # 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) + configure_file("${infile}" "${out_depends}" COPYONLY) else() # The .qrc file does not exist (yet). Let's add a dependency and hope # that it will be generated later |