diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-12 11:22:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-12 11:22:55 (GMT) |
| commit | 609d86e8131547e95269c2a5bd53336f948cae05 (patch) | |
| tree | 5e1b0b51abec8a855bdddf857bb687cdd65387ba | |
| parent | 93f10f06b3b86085a180e5259f653646e1705baf (diff) | |
| parent | 54290adcba5fa730a4e93d3a53b5d0451c6872e6 (diff) | |
| download | CMake-609d86e8131547e95269c2a5bd53336f948cae05.zip CMake-609d86e8131547e95269c2a5bd53336f948cae05.tar.gz CMake-609d86e8131547e95269c2a5bd53336f948cae05.tar.bz2 | |
Merge topic 'object-library-sbcs'
54290adcba VS: Fix SBCS support for object libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3537
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index d17a6d8..e2a4816 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1218,7 +1218,7 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues( this->GeneratorTarget->GetPropertyAsBool("VS_WINRT_EXTENSIONS")) { e1.Element("CharacterSet", "Unicode"); } else if (this->GeneratorTarget->GetType() <= - cmStateEnums::MODULE_LIBRARY && + cmStateEnums::OBJECT_LIBRARY && this->ClOptions[config]->UsingSBCS()) { e1.Element("CharacterSet", "NotSet"); } else { |