diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-12 11:22:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-12 11:22:01 (GMT) |
| commit | 1810a61b394eee2fe9465d5460bb578f833078da (patch) | |
| tree | b123aa0ba8b91234643ffef7a30ff31658948d92 | |
| parent | 14f69fab54291838170e6e2e9988c81fa8c66a88 (diff) | |
| parent | 54290adcba5fa730a4e93d3a53b5d0451c6872e6 (diff) | |
| download | CMake-1810a61b394eee2fe9465d5460bb578f833078da.zip CMake-1810a61b394eee2fe9465d5460bb578f833078da.tar.gz CMake-1810a61b394eee2fe9465d5460bb578f833078da.tar.bz2 | |
Merge branch 'object-library-sbcs' into release-3.15
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 cba7bef..ee5f9b4 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1213,7 +1213,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 { |