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:
Brad King
2021-06-29 13:21:55 +00:00
committed by Kitware Robot
2 changed files with 6 additions and 0 deletions

View File

@@ -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()

View File

@@ -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})