diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-03 14:35:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-03 14:35:34 (GMT) |
| commit | a72ff020db5be1a38effeda899908e24d92cea87 (patch) | |
| tree | dda68f38599e954d8d210ddfcc6f50cae2523c45 | |
| parent | aa0f6e83093486b0e7276aaddf5bf95f7c8419ce (diff) | |
| parent | 4abbb1400d81e1288cdf1e2f708eaa938f7b3955 (diff) | |
| download | CMake-a72ff020db5be1a38effeda899908e24d92cea87.zip CMake-a72ff020db5be1a38effeda899908e24d92cea87.tar.gz CMake-a72ff020db5be1a38effeda899908e24d92cea87.tar.bz2 | |
Merge branch 'fix-configure_file-COPYONLY' into release
| -rw-r--r-- | Help/manual/cmake-packages.7.rst | 2 | ||||
| -rw-r--r-- | Modules/Qt4Macros.cmake | 2 | ||||
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index c4cca6d..5d6201c 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -316,7 +316,7 @@ shared library: ) configure_file(cmake/ClimbingStatsConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/ClimbingStats/ClimbingStatsConfig.cmake" - COPY_ONLY + COPYONLY ) set(ConfigPackageLocation lib/cmake/ClimbingStats) 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 diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 8ca4360..2067690 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -265,7 +265,7 @@ STRING(COMPARE EQUAL "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}" KWSYS_IN_SOURCE_BUILD) IF(NOT KWSYS_IN_SOURCE_BUILD) CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/kwsysPrivate.h - ${PROJECT_BINARY_DIR}/kwsysPrivate.h COPY_ONLY IMMEDIATE) + ${PROJECT_BINARY_DIR}/kwsysPrivate.h COPYONLY IMMEDIATE) ENDIF(NOT KWSYS_IN_SOURCE_BUILD) # Select plugin module file name convention. |