diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-07 14:51:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-07 14:51:14 (GMT) |
| commit | 3536a8a52d27f2a546bc55c1b0490badca9b9b1e (patch) | |
| tree | bee7443a82bfbfd5526cddb87a648c915e7ab7a5 | |
| parent | 3d5402d1df9636c7da2a54a0dcef7dcdc31d3091 (diff) | |
| parent | d5014741c94c8e348d07329ddc86dbe8072c6eab (diff) | |
| download | CMake-3536a8a52d27f2a546bc55c1b0490badca9b9b1e.zip CMake-3536a8a52d27f2a546bc55c1b0490badca9b9b1e.tar.gz CMake-3536a8a52d27f2a546bc55c1b0490badca9b9b1e.tar.bz2 | |
Merge topic 'ext_disabled'
d5014741c9 Tests/CompileFeatures: Fix CMP0128OldSameStandard with default OFF
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7328
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index ad9619e..a001c5d 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -71,11 +71,7 @@ macro(mangle_flags variable) endmacro() function(test_cmp0128_old_same_standard) - if(extensions_default) - set(flag_ext "_EXT") - endif() - - set(flag "${${lang}${${lang}_STANDARD_DEFAULT}${flag_ext}_FLAG}") + set(flag "${${lang}${${lang}_STANDARD_DEFAULT}_EXT_FLAG}") if(NOT flag) return() |