summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-11 07:52:35 -0400
committerBrad King <brad.king@kitware.com>2019-07-12 07:20:23 -0400
commit54290adcba5fa730a4e93d3a53b5d0451c6872e6 (patch)
tree2fa80c830ebd221a50eeee2263168f798192f8a3
parent86ead0b5a32ee48907084a7cf85d00196cbf0366 (diff)
downloadcmake-54290adcba5fa730a4e93d3a53b5d0451c6872e6.tar.gz
VS: Fix SBCS support for object libraries
In commit 3a53005f7d (Build object library targets in VS, 2012-03-12, v2.8.8~29^2~13) we updated the condition for unicode but accidentally left out the SBCS case support for object libraries. Fixes: #19469
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index cba7bef35f..ee5f9b4d0f 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 {