mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-07 22:30:13 -06:00
Merge topic 'tests-tolerate-NINJA_STATUS'
63177678d0 Tests/RunCMake/Ninja.*: Sanitize NINJA_STATUS since we expect default behavior
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6271
This commit is contained in:
@@ -18,6 +18,9 @@ else()
|
||||
message(FATAL_ERROR "'ninja --version' reported:\n${ninja_out}")
|
||||
endif()
|
||||
|
||||
# Sanitize NINJA_STATUS since we expect default behavior.
|
||||
unset(ENV{NINJA_STATUS})
|
||||
|
||||
if(CMAKE_HOST_WIN32)
|
||||
run_cmake(SelectCompilerWindows)
|
||||
else()
|
||||
|
||||
@@ -5,6 +5,9 @@ include(RunCMake)
|
||||
set(RunCMake_GENERATOR "Ninja Multi-Config")
|
||||
set(RunCMake_GENERATOR_IS_MULTI_CONFIG 1)
|
||||
|
||||
# Sanitize NINJA_STATUS since we expect default behavior.
|
||||
unset(ENV{NINJA_STATUS})
|
||||
|
||||
function(check_files dir)
|
||||
cmake_parse_arguments(_check_files "" "" "INCLUDE;EXCLUDE" ${ARGN})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user