diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-26 12:42:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-26 12:42:23 (GMT) |
| commit | d13489fe2bed2e6b2ea514a357c097cae740ccf9 (patch) | |
| tree | c698cf06ffb915bb3f833296e794fcb7c562e508 | |
| parent | ba1dc990989565f227f20e6a9b45f58fb7f11e26 (diff) | |
| parent | 95dbcf0598958557069d3c38d2cc9c0e1c4cda12 (diff) | |
| download | CMake-d13489fe2bed2e6b2ea514a357c097cae740ccf9.zip CMake-d13489fe2bed2e6b2ea514a357c097cae740ccf9.tar.gz CMake-d13489fe2bed2e6b2ea514a357c097cae740ccf9.tar.bz2 | |
Merge topic 'RunCMake-test-lang' into release-3.17
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.cmake | 3 |
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() |