diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-08 12:58:23 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-08 08:58:30 -0400 |
| commit | 9cb77a629466c2380a70e7909437b9d51f4e98e1 (patch) | |
| tree | ca04290eb400d6c6a83189647435b9d026884086 /Modules/Internal | |
| parent | 0ebbda440524d3c9a80046b3daf55b821008a8d9 (diff) | |
| parent | 9dd585d12c54f6d0768aea6526ea627f81f436ad (diff) | |
| download | cmake-9cb77a629466c2380a70e7909437b9d51f4e98e1.tar.gz | |
Merge topic 'CheckCompilerFlag-restore-env'
9dd585d12c CheckCompilerFlag: Fix regression in locale environment preservation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7153
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CheckFlagCommonConfig.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Internal/CheckFlagCommonConfig.cmake b/Modules/Internal/CheckFlagCommonConfig.cmake index 3934c0249b..c011c24238 100644 --- a/Modules/Internal/CheckFlagCommonConfig.cmake +++ b/Modules/Internal/CheckFlagCommonConfig.cmake @@ -59,8 +59,8 @@ macro(CMAKE_CHECK_FLAG_COMMON_INIT _FUNC _LANG _SRC _PATTERNS) return() endif() # Normalize locale during test compilation. - set(_locale_vars LC_ALL LC_MESSAGES LANG) - foreach(v IN LISTS _locale_vars) + set(_CFCC_locale_vars LC_ALL LC_MESSAGES LANG) + foreach(v IN LISTS _CFCC_locale_vars) set(_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v} "$ENV{${v}}") set(ENV{${v}} C) endforeach() |