From ad16ae5c70778e6bfd6d30b17a3ad9b248b2a569 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 17 Nov 2022 10:24:29 -0500 Subject: VS: Recognize -std: flag in CMAKE_C_FLAGS in target with C++ sources Extend commit b325484928 (VS: Fix C language standard in target with C++ sources, 2020-09-28, v3.19.0-rc1~74^2) to account for users placing a `-std:` flag in `CMAKE_C_FLAGS`. --- Source/cmVisualStudio10TargetGenerator.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7e43bee..cd73551 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3293,6 +3293,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( this->GeneratorTarget->GetLanguages(languages, configName); if (languages.count("C")) { std::string flagsC; + this->LocalGenerator->AddLanguageFlags( + flagsC, this->GeneratorTarget, cmBuildStep::Compile, "C", configName); this->LocalGenerator->AddCompileOptions(flagsC, this->GeneratorTarget, "C", configName); Options optC(this->LocalGenerator, Options::Compiler, -- cgit v0.12