[Cmake-commits] CMake branch, master, updated. v3.15.0-rc4-275-g609d86e

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  609d86e8131547e95269c2a5bd53336f948cae05 (commit)
       via  54290adcba5fa730a4e93d3a53b5d0451c6872e6 (commit)
      from  93f10f06b3b86085a180e5259f653646e1705baf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=609d86e8131547e95269c2a5bd53336f948cae05
commit 609d86e8131547e95269c2a5bd53336f948cae05
Merge: 93f10f0 54290ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 12 11:22:45 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 12 07:22:55 2019 -0400

    Merge topic 'object-library-sbcs'
    
    54290adcba VS: Fix SBCS support for object libraries
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3537


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54290adcba5fa730a4e93d3a53b5d0451c6872e6
commit 54290adcba5fa730a4e93d3a53b5d0451c6872e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 11 07:52:35 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 12 07:20:23 2019 -0400

    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

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 {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake