summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-02-26 12:42:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-02-26 12:42:23 (GMT)
commit0b903779e89c4843457dd1694fd03e464b8160a5 (patch)
tree5fed63e80fd6694d198083a5c25ac73b49cf731e
parent9f3eb040ede7cbd3034692ff018f3b1e531a0b2e (diff)
parent95dbcf0598958557069d3c38d2cc9c0e1c4cda12 (diff)
downloadCMake-0b903779e89c4843457dd1694fd03e464b8160a5.zip
CMake-0b903779e89c4843457dd1694fd03e464b8160a5.tar.gz
CMake-0b903779e89c4843457dd1694fd03e464b8160a5.tar.bz2
Merge topic 'RunCMake-test-lang'
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4389
-rw-r--r--Tests/RunCMake/Make/RunCMakeTest.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/Make/RunCMakeTest.cmake b/Tests/RunCMake/Make/RunCMakeTest.cmake
index 82db6b7..6b2721c 100644
--- a/Tests/RunCMake/Make/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Make/RunCMakeTest.cmake
@@ -26,10 +26,13 @@ function(run_VerboseBuild)
endif()
run_cmake_command(VerboseBuild-build ${CMAKE_COMMAND} --build . -v --clean-first)
unset(RunCMake-stdout-file)
+ set(_backup_lang "$ENV{LANG}")
if(MAKE_IS_GNU)
set(RunCMake-stdout-file VerboseBuild-nowork-gnu-stdout.txt)
+ set(ENV{LANG} "C")
endif()
run_cmake_command(VerboseBuild-nowork ${CMAKE_COMMAND} --build . --verbose)
+ set(ENV{LANG} "${_backup_lang}")
endfunction()
run_VerboseBuild()