diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-29 12:25:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-29 12:25:42 (GMT) |
| commit | f2b84d24cfccf49b6332cf3f2ca164fd71ae023e (patch) | |
| tree | 67d3b6500279ec0a57498d534bc2be747ec84a41 /Source/cmMakefile.cxx | |
| parent | 3453d797a57591ec6e6f0ed8e9a03f6298d7cd18 (diff) | |
| parent | 7d6861f367673b57bf45e14863f1104e8e28eafa (diff) | |
| download | CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.zip CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.tar.gz CMake-f2b84d24cfccf49b6332cf3f2ca164fd71ae023e.tar.bz2 | |
Merge topic 'fileApiAddLanguageStandardBacktrace'
7d6861f367 fileapi: Extend codemodel targets with language standard
ba835874a4 Add backtrace support for language standard
e43486a639 cmGeneratorTarget: Clarify name of language property lookup helper
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4798
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 891e290..d34259f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -5072,7 +5072,7 @@ bool cmMakefile::AddRequiredTargetCxxFeature(cmTarget* target, target->GetProperty(cmStrCat(lang, "_STANDARD")), newRequiredStandard, error)) { if (!newRequiredStandard.empty()) { - target->SetProperty(cmStrCat(lang, "_STANDARD"), newRequiredStandard); + target->SetLanguageStandardProperty(lang, newRequiredStandard, feature); } return true; } @@ -5253,7 +5253,7 @@ bool cmMakefile::AddRequiredTargetCudaFeature(cmTarget* target, target->GetProperty(cmStrCat(lang, "_STANDARD")), newRequiredStandard, error)) { if (!newRequiredStandard.empty()) { - target->SetProperty(cmStrCat(lang, "_STANDARD"), newRequiredStandard); + target->SetLanguageStandardProperty(lang, newRequiredStandard, feature); } return true; } @@ -5358,7 +5358,7 @@ bool cmMakefile::AddRequiredTargetCFeature(cmTarget* target, target->GetProperty(cmStrCat(lang, "_STANDARD")), newRequiredStandard, error)) { if (!newRequiredStandard.empty()) { - target->SetProperty(cmStrCat(lang, "_STANDARD"), newRequiredStandard); + target->SetLanguageStandardProperty(lang, newRequiredStandard, feature); } return true; } |