diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-20 13:33:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-20 13:33:38 (GMT) |
| commit | ae5f30b36a58bffbc0954906eb2e60961f57caca (patch) | |
| tree | d644c55d9bb62a33c221ae3d30b4d177397c3d3c | |
| parent | 184be68580d19900b289bfc45d507980ea2bce8b (diff) | |
| parent | a15e375cddb415ebe89aa5896d783b821aca940c (diff) | |
| download | CMake-ae5f30b36a58bffbc0954906eb2e60961f57caca.zip CMake-ae5f30b36a58bffbc0954906eb2e60961f57caca.tar.gz CMake-ae5f30b36a58bffbc0954906eb2e60961f57caca.tar.bz2 | |
Merge topic 'mfc-utility-targets'
a15e375c Fix MFC setting on utility targets (#15867)
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 27ae685..09d4a90 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -762,13 +762,16 @@ void cmVisualStudio10TargetGenerator std::string mfcFlagValue = mfcFlag ? mfcFlag : "0"; std::string useOfMfcValue = "false"; - if(mfcFlagValue == "1") - { - useOfMfcValue = "Static"; - } - else if(mfcFlagValue == "2") + if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY) { - useOfMfcValue = "Dynamic"; + if(mfcFlagValue == "1") + { + useOfMfcValue = "Static"; + } + else if(mfcFlagValue == "2") + { + useOfMfcValue = "Dynamic"; + } } std::string mfcLine = "<UseOfMfc>"; mfcLine += useOfMfcValue + "</UseOfMfc>\n"; |