[Cmake-commits] CMake branch, next, updated. v2.8.7-2751-g82c3726

David Cole david.cole at kitware.com
Tue Feb 21 11:31:58 EST 2012


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, next has been updated
       via  82c3726537c24183459270355db507a638ee07e1 (commit)
       via  df19b9cadb5caca0f77ee87b8e28181e61c0658e (commit)
      from  a9dd6f0248572cc14896970b2a6d45a504a9333c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c3726537c24183459270355db507a638ee07e1
commit 82c3726537c24183459270355db507a638ee07e1
Merge: a9dd6f0 df19b9c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 21 11:31:34 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 21 11:31:34 2012 -0500

    Merge topic 'fix-12189-support-SBCS-in-VS' into next
    
    df19b9c VS6: Avoid _MBCS define when _SBCS is defined (#12189)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df19b9cadb5caca0f77ee87b8e28181e61c0658e
commit df19b9cadb5caca0f77ee87b8e28181e61c0658e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 21 11:29:06 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Feb 21 11:29:06 2012 -0500

    VS6: Avoid _MBCS define when _SBCS is defined (#12189)
    
    Should fix the failing SBCS test on the VS6 dashboard.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 1dfcbea..fe5d48d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1605,11 +1605,13 @@ void cmLocalVisualStudio6Generator
       flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
       }
-    
-    // if unicode is not found, then add -D_MBCS
+
+    // if _UNICODE and _SBCS are not found, then add -D_MBCS
     std::string defs = this->Makefile->GetDefineFlags();
     if(flags.find("D_UNICODE") == flags.npos &&
-       defs.find("D_UNICODE") == flags.npos) 
+       defs.find("D_UNICODE") == flags.npos &&
+       flags.find("D_SBCS") == flags.npos &&
+       defs.find("D_SBCS") == flags.npos)
       {
       flags += " /D \"_MBCS\"";
       }

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list