summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/Ninja/SubDir.cmake
diff options
context:
space:
mode:
authorAlexis Murzeau <amubtdx@outlook.fr>2016-10-23 16:58:28 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-24 14:30:02 (GMT)
commite983bd326a9e3b7902d8f7cf0d891030ad3bd4c1 (patch)
treed19219a982ea8c6d7b648a29ecb2b73536bc3113 /Tests/RunCMake/Ninja/SubDir.cmake
parentf660832999e086f02a9f3552c028aed900cd7249 (diff)
downloadCMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.zip
CMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.tar.gz
CMake-e983bd326a9e3b7902d8f7cf0d891030ad3bd4c1.tar.bz2
Ninja: Use binary dir for `$subdir/all` targets
The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11) use as `$subdir` the relative path from the top of the source tree to the current source directory. This is not correct when using `add_subdirectory(test test_bin)`. Instead we need to use the relative path from the top of the binary tree to the current binary directory as was done for related targets by commit v3.7.0-rc1~268^2 (Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
Diffstat (limited to 'Tests/RunCMake/Ninja/SubDir.cmake')
-rw-r--r--Tests/RunCMake/Ninja/SubDir.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/SubDir.cmake b/Tests/RunCMake/Ninja/SubDir.cmake
index d227753..11f467a 100644
--- a/Tests/RunCMake/Ninja/SubDir.cmake
+++ b/Tests/RunCMake/Ninja/SubDir.cmake
@@ -1,5 +1,6 @@
include(CTest)
add_subdirectory(SubDir)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/SubDirSource SubDirBinary)
add_custom_target(TopFail ALL COMMAND does_not_exist)
add_test(NAME TopTest COMMAND ${CMAKE_COMMAND} -E echo "Running TopTest")
install(CODE [[