diff options
author | Brad King <brad.king@kitware.com> | 2018-11-05 12:42:27 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-05 12:42:47 (GMT) |
commit | 259292ebcccac1a3aba931d2437e1432f77c0945 (patch) | |
tree | cec28b487d277a2f2bc2b197db94d22ce5df1d1b /Tests | |
parent | 95894a605e3c39c73390f4db1868c457b16bf5a2 (diff) | |
parent | 98d59417b0c6ac3ea85e315133337030dad93496 (diff) | |
download | CMake-259292ebcccac1a3aba931d2437e1432f77c0945.zip CMake-259292ebcccac1a3aba931d2437e1432f77c0945.tar.gz CMake-259292ebcccac1a3aba931d2437e1432f77c0945.tar.bz2 |
Merge topic 'custom-command-work-dir-genex'
98d59417b0 add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2559
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CustomCommandWorkingDirectory/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt index 2e12a78..3bab1fe 100644 --- a/Tests/CustomCommandWorkingDirectory/CMakeLists.txt +++ b/Tests/CustomCommandWorkingDirectory/CMakeLists.txt @@ -47,7 +47,7 @@ file(MAKE_DIRECTORY ${TestWorkingDir_BINARY_DIR}/genex) add_custom_command( OUTPUT "${TestWorkingDir_BINARY_DIR}/genex/working.c" COMMAND "${CMAKE_COMMAND}" -E copy "${TestWorkingDir_SOURCE_DIR}/working.c.in" "${TestWorkingDir_BINARY_DIR}/genex/working.c" - WORKING_DIRECTORY "${TestWorkingDir_BINARY_DIR}/$<1:genex>/" + WORKING_DIRECTORY "$<0:not_used/>${TestWorkingDir_BINARY_DIR}/$<1:genex>/" COMMENT "custom command" ) @@ -58,7 +58,7 @@ add_custom_target( CustomGenex ALL COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${TestWorkingDir_SOURCE_DIR}/customTarget.c" "${TestWorkingDir_BINARY_DIR}/genex/customTarget.c" BYPRODUCTS "${TestWorkingDir_BINARY_DIR}/genex/customTarget.c" - WORKING_DIRECTORY "${TestWorkingDir_BINARY_DIR}/$<1:genex>/" + WORKING_DIRECTORY "$<0:not_used/>${TestWorkingDir_BINARY_DIR}/$<1:genex>/" ) add_dependencies(workinggenex CustomGenex) |