diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-22 11:38:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-22 11:38:17 (GMT) |
| commit | 0b95e6164e2a995b5e9ec1331266c68c311b3ee4 (patch) | |
| tree | f52879d4a492264dca5f3f001439f54d001abc74 | |
| parent | c9bc062632c04e199a9a9e0cfc4fb16ccfcdc151 (diff) | |
| parent | d4390c13e97ce7828f4728b107513310c220c77f (diff) | |
| download | CMake-0b95e6164e2a995b5e9ec1331266c68c311b3ee4.zip CMake-0b95e6164e2a995b5e9ec1331266c68c311b3ee4.tar.gz CMake-0b95e6164e2a995b5e9ec1331266c68c311b3ee4.tar.bz2 | |
Merge topic 'check-compiler-flag-result' into release-3.18
d4390c13e9 Merge branch 'backport-3.17-check-compiler-flag-result'
d46590910c Check*CompilerFlag: Do not set result as a normal variable too
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !5250
| -rw-r--r-- | Modules/CheckCCompilerFlag.cmake | 1 | ||||
| -rw-r--r-- | Modules/CheckCXXCompilerFlag.cmake | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 6d65313..1452b51 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -54,5 +54,4 @@ function(check_c_compiler_flag _flag _var) foreach(v IN LISTS _locale_vars) set(ENV{${v}} ${_locale_vars_saved_${v}}) endforeach() - set(${_var} "${${_var}}" PARENT_SCOPE) endfunction() diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index 5e07c25..544e9ac 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -54,5 +54,4 @@ function(check_cxx_compiler_flag _flag _var) foreach(v IN LISTS _locale_vars) set(ENV{${v}} ${_locale_vars_saved_${v}}) endforeach() - set(${_var} "${${_var}}" PARENT_SCOPE) endfunction() |