mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-ninja-subdir-binary-dir' into release

Browse Source
This commit is contained in:
Brad King
2016-10-24 10:31:14 -04:00
parent 22ef70499e 42db2ebc75
commit 6cd02f08c7
8 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/Ninja/RunCMakeTest.cmake
+9
View File
@@ -45,14 +45,23 @@ function(run_SubDir)
set(SubDir_all [[SubDir\all]])
set(SubDir_test [[SubDir\test]])
set(SubDir_install [[SubDir\install]])
set(SubDirBinary_test [[SubDirBinary\test]])
set(SubDirBinary_all [[SubDirBinary\all]])
set(SubDirBinary_install [[SubDirBinary\install]])
else()
set(SubDir_all [[SubDir/all]])
set(SubDir_test [[SubDir/test]])
set(SubDir_install [[SubDir/install]])
set(SubDirBinary_all [[SubDirBinary/all]])
set(SubDirBinary_test [[SubDirBinary/test]])
set(SubDirBinary_install [[SubDirBinary/install]])
endif()
run_cmake_command(SubDir-build ${CMAKE_COMMAND} --build . --target ${SubDir_all})
run_cmake_command(SubDir-test ${CMAKE_COMMAND} --build . --target ${SubDir_test})
run_cmake_command(SubDir-install ${CMAKE_COMMAND} --build . --target ${SubDir_install})
run_cmake_command(SubDirBinary-build ${CMAKE_COMMAND} --build . --target ${SubDirBinary_all})
run_cmake_command(SubDirBinary-test ${CMAKE_COMMAND} --build . --target ${SubDirBinary_test})
run_cmake_command(SubDirBinary-install ${CMAKE_COMMAND} --build . --target ${SubDirBinary_install})
endfunction()
run_SubDir()
Tests/RunCMake/Ninja/SubDir.cmake
+1
View File
@@ -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 [[
Tests/RunCMake/Ninja/SubDirBinary-build-stdout.txt
+1
View File
@@ -0,0 +1 @@
Building SubDirSourceInAll
Tests/RunCMake/Ninja/SubDirBinary-install-stdout.txt
+1
View File
@@ -0,0 +1 @@
-- Installing SubDirSource
Tests/RunCMake/Ninja/SubDirBinary-test-stdout.txt
+1
View File
@@ -0,0 +1 @@
1/1 Test #1: SubDirSourceTest
Tests/RunCMake/Ninja/SubDirSource/CMakeLists.txt
+6
View File
@@ -0,0 +1,6 @@
add_custom_target(SubDirSourceFail COMMAND does_not_exist)
add_custom_target(SubDirSourceInAll ALL COMMAND ${CMAKE_COMMAND} -E echo "Building SubDirSourceInAll")
add_test(NAME SubDirSourceTest COMMAND ${CMAKE_COMMAND} -E echo "Running SubDirSourceTest")
install(CODE [[
message(STATUS "Installing SubDirSource")
]])