diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-28 15:52:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-28 15:53:12 (GMT) |
| commit | 3e93b2fa66ecca7c25818c32a2b50acef2627841 (patch) | |
| tree | 2f87c91f2e55f76327eb928fe5875e6b6f241069 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | ffa1fa20e6ef3e78aad2dca75658232593509519 (diff) | |
| parent | 8909a450a6fb74447ef6dc49f16d747bae3c72ea (diff) | |
| download | CMake-3e93b2fa66ecca7c25818c32a2b50acef2627841.zip CMake-3e93b2fa66ecca7c25818c32a2b50acef2627841.tar.gz CMake-3e93b2fa66ecca7c25818c32a2b50acef2627841.tar.bz2 | |
Merge topic 'vs-ConfigurationType-genex'
8909a450a6 VS: Add support for generator expressions to VS_CONFIGURATION_TYPE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3746
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 13f6295..44614a3 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1115,7 +1115,10 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues(Elem& e0) std::string configType; if (const char* vsConfigurationType = this->GeneratorTarget->GetProperty("VS_CONFIGURATION_TYPE")) { - configType = vsConfigurationType; + cmGeneratorExpression ge; + std::unique_ptr<cmCompiledGeneratorExpression> cge = + ge.Parse(vsConfigurationType); + configType = cge->Evaluate(this->LocalGenerator, c); } else { switch (this->GeneratorTarget->GetType()) { case cmStateEnums::SHARED_LIBRARY: |