Salome HOME
merge from master
[tools/sat_salome.git] / products / patches / cmake-3.12.1.patch
1 diff -Naur --exclude=CVS --exclude=.git --exclude=.hg cmake-3.12.1.orig/Modules/CheckCXXCompilerFlag.cmake cmake-3.12.1.new/Modules/CheckCXXCompilerFlag.cmake
2 --- cmake-3.12.1.orig/Modules/CheckCXXCompilerFlag.cmake        2018-08-09 15:14:07.000000000 +0300
3 +++ cmake-3.12.1.new/Modules/CheckCXXCompilerFlag.cmake 2020-08-03 14:51:05.000000000 +0300
4 @@ -43,8 +43,10 @@
5     # Normalize locale during test compilation.
6     set(_CheckCXXCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
7     foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS})
8 -     set(_CheckCXXCompilerFlag_SAVED_${v} "$ENV{${v}}")
9 -     set(ENV{${v}} C)
10 +     if("$ENV{${v}}")
11 +       set(_CheckCXXCompilerFlag_SAVED_${v} "$ENV{${v}}")
12 +       set(ENV{${v}} C)
13 +     endif()
14     endforeach()
15     CHECK_COMPILER_FLAG_COMMON_PATTERNS(_CheckCXXCompilerFlag_COMMON_PATTERNS)
16     CHECK_CXX_SOURCE_COMPILES("int main() { return 0; }" ${_RESULT}
17 @@ -53,8 +55,10 @@
18       ${_CheckCXXCompilerFlag_COMMON_PATTERNS}
19       )
20     foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS})
21 -     set(ENV{${v}} ${_CheckCXXCompilerFlag_SAVED_${v}})
22 -     unset(_CheckCXXCompilerFlag_SAVED_${v})
23 +     if("${_CheckCXXCompilerFlag_SAVED_${v}}")
24 +       set(ENV{${v}} ${_CheckCXXCompilerFlag_SAVED_${v}})
25 +       unset(_CheckCXXCompilerFlag_SAVED_${v})
26 +     endif()
27     endforeach()
28     unset(_CheckCXXCompilerFlag_LOCALE_VARS)
29     unset(_CheckCXXCompilerFlag_COMMON_PATTERNS)