diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-11 12:56:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-11 12:57:00 (GMT) |
| commit | a218d67f500614ddd6a2ddcf9f55ad964243673f (patch) | |
| tree | 406ac21a3f632bb8d4ca97b3137afe472d402517 /Tests | |
| parent | 3fb9e3cc67e8279bae04f6863eceea996ddca626 (diff) | |
| parent | 491dddfbdeb7b958805e931b37783cca448eb8d8 (diff) | |
| download | CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.zip CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.tar.gz CMake-a218d67f500614ddd6a2ddcf9f55ad964243673f.tar.bz2 | |
Merge topic 'bootstrap-ninja'
491dddfbde Bootstrap: Add support for Ninja
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3652
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BootstrapTest.cmake | 7 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake index 07a65bf..137de78 100644 --- a/Tests/BootstrapTest.cmake +++ b/Tests/BootstrapTest.cmake @@ -1,12 +1,15 @@ file(MAKE_DIRECTORY "${bin_dir}") include(ProcessorCount) ProcessorCount(nproc) +if(generator MATCHES "Ninja") + set(ninja_arg --generator=Ninja) +endif() if(NOT nproc EQUAL 0) set(parallel_arg --parallel=${nproc}) endif() -message(STATUS "running bootstrap: ${bootstrap} ${parallel_arg}") +message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}") execute_process( - COMMAND ${bootstrap} ${parallel_arg} + COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} WORKING_DIRECTORY "${bin_dir}" RESULT_VARIABLE result ) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 4a774dd..e4e09fa 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3240,6 +3240,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH COMMAND ${CMAKE_CMAKE_COMMAND} -D "bootstrap=${bootstrap}" -D "bin_dir=${CMake_BINARY_DIR}/Tests/BootstrapTest" + -D "generator=${CMAKE_GENERATOR}" -P ${CMAKE_CURRENT_SOURCE_DIR}/BootstrapTest.cmake ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BootstrapTest") |