kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-configure_file-COPYONLY' into release

This commit is contained in:
Brad King 2014-11-03 09:35:34 -05:00
parent aa0f6e8309 4abbb1400d
commit a72ff020db
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/manual/cmake-packages.7.rst
View File

@ -316,7 +316,7 @@ shared library:
) )
configure_file(cmake/ClimbingStatsConfig.cmake configure_file(cmake/ClimbingStatsConfig.cmake
"${CMAKE_CURRENT_BINARY_DIR}/ClimbingStats/ClimbingStatsConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ClimbingStats/ClimbingStatsConfig.cmake"
COPY_ONLY COPYONLY
) )
set(ConfigPackageLocation lib/cmake/ClimbingStats) set(ConfigPackageLocation lib/cmake/ClimbingStats)

2
Modules/Qt4Macros.cmake
View File

@ -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 # let's make a configured file and add it as a dependency so cmake is run
# again when dependencies need to be recomputed. # again when dependencies need to be recomputed.
QT4_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends) QT4_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends)
configure_file("${infile}" "${out_depends}" COPY_ONLY) configure_file("${infile}" "${out_depends}" COPYONLY)
else() else()
# The .qrc file does not exist (yet). Let's add a dependency and hope # The .qrc file does not exist (yet). Let's add a dependency and hope
# that it will be generated later # that it will be generated later

2
Source/kwsys/CMakeLists.txt
View File

@ -265,7 +265,7 @@ STRING(COMPARE EQUAL "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}"
KWSYS_IN_SOURCE_BUILD) KWSYS_IN_SOURCE_BUILD)
IF(NOT KWSYS_IN_SOURCE_BUILD) IF(NOT KWSYS_IN_SOURCE_BUILD)
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/kwsysPrivate.h 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) ENDIF(NOT KWSYS_IN_SOURCE_BUILD)
# Select plugin module file name convention. # Select plugin module file name convention.