diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-01 11:59:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-01 11:59:33 (GMT) |
| commit | 436b57ccb22bea6ec6e9a0fda8922e8d217d91f4 (patch) | |
| tree | bd42c4ff2ccdfcaf1a458f719b445592b9fa58b1 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | b1e1cb2d0dea1198efb4b02652180cd3eae908c9 (diff) | |
| parent | c1f1eaf7a4e4f1dfaba9a1fb1738aad48296bcda (diff) | |
| download | CMake-436b57ccb22bea6ec6e9a0fda8922e8d217d91f4.zip CMake-436b57ccb22bea6ec6e9a0fda8922e8d217d91f4.tar.gz CMake-436b57ccb22bea6ec6e9a0fda8922e8d217d91f4.tar.bz2 | |
Merge topic 'genexpr-for-mfc-flag'
c1f1eaf7a4 VS: Teach CMAKE_MFC_FLAG to support generator expressions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5283
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c025814..413166e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1224,7 +1224,8 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues( cmGlobalVisualStudio10Generator* gg = this->GlobalGenerator; cmProp mfcFlag = this->Makefile->GetDefinition("CMAKE_MFC_FLAG"); if (mfcFlag) { - std::string const mfcFlagValue = *mfcFlag; + std::string const mfcFlagValue = + cmGeneratorExpression::Evaluate(*mfcFlag, this->LocalGenerator, config); std::string useOfMfcValue = "false"; if (this->GeneratorTarget->GetType() <= cmStateEnums::OBJECT_LIBRARY) { |