diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-30 14:12:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-30 14:13:05 (GMT) |
| commit | ce0755496721380ddcb1707fe4f4db65833f355f (patch) | |
| tree | b088e0e08300f77cdd1522824a6434780b0ccd7a | |
| parent | 8639ac2aec1e7e03ede9a17cb80b3f5c189aea65 (diff) | |
| parent | 373b29bd3f494c2c61f22fee11e9a8350d9699bb (diff) | |
| download | CMake-ce0755496721380ddcb1707fe4f4db65833f355f.zip CMake-ce0755496721380ddcb1707fe4f4db65833f355f.tar.gz CMake-ce0755496721380ddcb1707fe4f4db65833f355f.tar.bz2 | |
Merge topic 'enable_warnings'
373b29bd3f Rename {_ => }CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Marcel Raad <marcel.raad@teamviewer.com>
Merge-request: !9688
| -rw-r--r-- | Modules/Compiler/IntelLLVM.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/MSVC.cmake | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Compiler/IntelLLVM.cmake b/Modules/Compiler/IntelLLVM.cmake index 079c894..b9f4ca0 100644 --- a/Modules/Compiler/IntelLLVM.cmake +++ b/Modules/Compiler/IntelLLVM.cmake @@ -35,7 +35,7 @@ if(CMAKE_HOST_WIN32) if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2021.4") set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-external:I") if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2022.2") - set(_CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ") + set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ") endif() endif() endif() diff --git a/Modules/Compiler/MSVC.cmake b/Modules/Compiler/MSVC.cmake index 154b657..9c09af1 100644 --- a/Modules/Compiler/MSVC.cmake +++ b/Modules/Compiler/MSVC.cmake @@ -20,6 +20,6 @@ macro(__compiler_msvc lang) # The `/external:I` flag was made non-experimental in 19.29.30036.3. if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30036.3) set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-external:I") - set(_CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ") + set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ") endif () endmacro() diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index e2c693a..015511d 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -911,7 +911,7 @@ std::string cmLocalGenerator::GetIncludeFlags( sysIncludeFlag = this->Makefile->GetDefinition( cmStrCat("CMAKE_INCLUDE_SYSTEM_FLAG_", lang)); sysIncludeFlagWarning = this->Makefile->GetDefinition( - cmStrCat("_CMAKE_INCLUDE_SYSTEM_FLAG_", lang, "_WARNING")); + cmStrCat("CMAKE_INCLUDE_SYSTEM_FLAG_", lang, "_WARNING")); } cmValue fwSearchFlag = this->Makefile->GetDefinition( diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6c995c4..51a9ad5 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3449,7 +3449,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( if (gotOneSys) { if (auto sysIncludeFlagWarning = this->Makefile->GetDefinition( - cmStrCat("_CMAKE_INCLUDE_SYSTEM_FLAG_", this->LangForClCompile, + cmStrCat("CMAKE_INCLUDE_SYSTEM_FLAG_", this->LangForClCompile, "_WARNING"))) { flags = cmStrCat(flags, ' ', *sysIncludeFlagWarning); } |