diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-26 21:32:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-26 23:02:02 (GMT) |
| commit | 88548a45fbd35205469ac9fd332349551e172496 (patch) | |
| tree | 7fb78e2070cd8320d73b0f4f2c8e1b2cf962e5d3 /Tests/CustomCommandWorkingDirectory | |
| parent | 7befc00783ca9739e7585ff4d2b645a762a38396 (diff) | |
| download | CMake-88548a45fbd35205469ac9fd332349551e172496.zip CMake-88548a45fbd35205469ac9fd332349551e172496.tar.gz CMake-88548a45fbd35205469ac9fd332349551e172496.tar.bz2 | |
Handle relative WORKING_DIRECTORY in add_custom_(command|target)
This also fixes handling of trailing slashes in the directory name.
Diffstat (limited to 'Tests/CustomCommandWorkingDirectory')
| -rw-r--r-- | Tests/CustomCommandWorkingDirectory/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt index d272ffe..36d32e4 100644 --- a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt +++ b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt @@ -10,6 +10,7 @@ ADD_CUSTOM_COMMAND( SET_SOURCE_FILES_PROPERTIES( "${TestWorkingDir_BINARY_DIR}/customTarget.c" + "${TestWorkingDir_BINARY_DIR}/customTarget2.c" PROPERTIES GENERATED 1) ADD_EXECUTABLE(working "${TestWorkingDir_BINARY_DIR}/working.c" @@ -28,8 +29,14 @@ add_custom_command( OUTPUT working2.c # Relative to build tree COMMAND "${CMAKE_COMMAND}" -E copy ${TestWorkingDir_SOURCE_DIR}/working.c.in ../working2.c DEPENDS ${TestWorkingDir_SOURCE_DIR}/working.c.in/ # trailing slash should be removed - WORKING_DIRECTORY ${TestWorkingDir_BINARY_DIR}/work + WORKING_DIRECTORY work/ # Relative to build tree, trailing slash ) -add_executable(working2 working2.c ${TestWorkingDir_BINARY_DIR}/customTarget.c) +add_executable(working2 working2.c ${TestWorkingDir_BINARY_DIR}/customTarget2.c) + +add_custom_target( + Custom2 ALL + COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${TestWorkingDir_SOURCE_DIR}/customTarget.c ../customTarget2.c + WORKING_DIRECTORY work/ # Relative to build tree, trailing slash +) add_dependencies(working2 Custom2) |