diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-10-22 13:05:49 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-07 16:11:18 (GMT) |
| commit | baff44345cff8e635766e020d316da514616c16e (patch) | |
| tree | 5d5052e16ad545de670d3ec116a378297b2f482c /Source/cmMakefile.cxx | |
| parent | f97bf4370c283432c4e14fe54ed481d5d9b7ceef (diff) | |
| download | CMake-baff44345cff8e635766e020d316da514616c16e.zip CMake-baff44345cff8e635766e020d316da514616c16e.tar.gz CMake-baff44345cff8e635766e020d316da514616c16e.tar.bz2 | |
cmTarget: Allow populating COMPILE_FEATURES using generator expressions.
Delay validation of the content as a feature if it contains a
generator expression. It will be checked again at generate-time
after evaluation.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0b3c43e..5004a08 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4521,6 +4521,11 @@ bool cmMakefile:: AddRequiredTargetFeature(cmTarget *target, const std::string& feature, std::string *error) const { + if (cmGeneratorExpression::Find(feature) != std::string::npos) + { + target->AppendProperty("COMPILE_FEATURES", feature.c_str()); + return true; + } bool isCxxFeature = std::find_if(cmArrayBegin(CXX_FEATURES) + 1, cmArrayEnd(CXX_FEATURES), cmStrCmp(feature)) != cmArrayEnd(CXX_FEATURES); |