[Cmake-commits] CMake branch, next, updated. v2.8.7-3089-g1cee05a

[David Cole]

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  1cee05a76dbf24262cf3bd883d68eb9bb28e25a5 (commit)
       via  b28e7fa174798717ebf8e18b8d97755d3568b04d (commit)
      from  638bcf23310fef7a74c3f52292d151e6b8184c76 (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=1cee05a76dbf24262cf3bd883d68eb9bb28e25a5
commit 1cee05a76dbf24262cf3bd883d68eb9bb28e25a5
Merge: 638bcf2 b28e7fa
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Mar 6 18:49:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 6 18:49:56 2012 -0500

    Merge topic 'fix-12189-support-SBCS-in-VS' into next
    
    b28e7fa VS6: Avoid SBCS test on VS6 (#12189)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b28e7fa174798717ebf8e18b8d97755d3568b04d
commit b28e7fa174798717ebf8e18b8d97755d3568b04d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Mar 6 18:41:56 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Mar 6 18:45:51 2012 -0500

    VS6: Avoid SBCS test on VS6 (#12189)
    
    The previous commit, df19b9ca, assumed that the corresponding
    _UNICODE functionality in the VS6 generator actually worked.
    That turns out not to be the case. Unicode definition does not
    actually suppress _MBCS definition, so neither does this new
    code...
    
    Don't test it here, since the patch submitter for _SBCS does
    not need VS6 support.
    
    If somebody needs _UNICODE and _SBCS support to suppress the
    definition of _MBCS in the VS6 generator, it is work yet to do.
    Patches welcome.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index da656d4..3e1a962 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1306,7 +1306,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   endif()
 
   IF(${CMAKE_TEST_GENERATOR} MATCHES "Visual Studio")
-    ADD_TEST_MACRO(SBCS SBCS)
+    IF(NOT MSVC60)
+      ADD_TEST_MACRO(SBCS SBCS)
+    ENDIF(NOT MSVC60)
 
     ADD_TEST(VSExternalInclude ${CMAKE_CTEST_COMMAND}
       --build-and-test

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

Summary of changes:
 Tests/CMakeLists.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake