[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2754-gafd4254

[Brad King]

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  afd4254242f6a14158eac893e5148ed87999250c (commit)
       via  4e4688e46944bd94966d8abdaad68aad1cc2212b (commit)
       via  6bfa3d8668ecbc0c7b57f1c0fdcd56ba177a00b6 (commit)
       via  c6253fba415238bc85f4b74365a7d6ebac1735e7 (commit)
      from  9adc37ca5db8cd92e538b465b92661211ca5a434 (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=afd4254242f6a14158eac893e5148ed87999250c
commit afd4254242f6a14158eac893e5148ed87999250c
Merge: 9adc37c 4e4688e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 11:59:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 11 11:59:16 2013 -0400

    Merge topic 'vs10-preprocessor-semicolons' into next
    
    4e4688e VS 10: Escape ; as %3B in preprocessor definitions (#14073)
    6bfa3d8 CMake Nightly Date Stamp
    c6253fb CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e4688e46944bd94966d8abdaad68aad1cc2212b
commit 4e4688e46944bd94966d8abdaad68aad1cc2212b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 11:34:17 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 11:41:15 2013 -0400

    VS 10: Escape ; as %3B in preprocessor definitions (#14073)
    
    Use the suggestion from http://support.microsoft.com/kb/2262855 to escape
    semicolons in preprocessor definitions for VS >= 10.  Update the
    COMPILE_DEFINITIONS documentation disclaimer list of known limitations
    accordingly.  Update our "Preprocess" test to cover the case.
    
    Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr at kitware.com>

diff --git a/Source/cmDocumentCompileDefinitions.h b/Source/cmDocumentCompileDefinitions.h
index ef3b3e7..d15bd6d 100644
--- a/Source/cmDocumentCompileDefinitions.h
+++ b/Source/cmDocumentCompileDefinitions.h
@@ -23,7 +23,7 @@
   "in a (configured) header file.  Then report the limitation.  "       \
   "Known limitations include:\n"                                        \
   "  #          - broken almost everywhere\n"                           \
-  "  ;          - broken in VS IDE and Borland Makefiles\n"             \
+  "  ;          - broken in VS IDE 7.0 and Borland Makefiles\n"         \
   "  ,          - broken in VS IDE\n"                                   \
   "  %          - broken in some cases in NMake\n"                      \
   "  & |        - broken in some cases on MinGW\n"                      \
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 1df0d9e..3c1cf95 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -6,6 +6,7 @@
 inline std::string cmVisualStudio10GeneratorOptionsEscapeForXML(const char* s)
 {
   std::string ret = s;
+  cmSystemTools::ReplaceString(ret, ";", "%3B");
   cmSystemTools::ReplaceString(ret, "&", "&amp;");
   cmSystemTools::ReplaceString(ret, "<", "&lt;");
   cmSystemTools::ReplaceString(ret, ">", "&gt;");
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 78746e7..fed9163 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 # must not have it escaped inside the configured header.
 set(STRING_EXTRA "")
 
-if(NOT BORLAND AND NOT PP_VS70 AND NOT PP_VS100 AND NOT PP_VS110)
+if(NOT BORLAND AND NOT PP_VS70)
   # Borland, VS70 IDE: ;
   # The Borland compiler will simply not accept a non-escaped semicolon
   # on the command line.  If it is escaped \; then the escape character
@@ -63,7 +63,6 @@ if(NOT BORLAND AND NOT PP_VS70 AND NOT PP_VS100 AND NOT PP_VS110)
   #
   # The VS 7.0 IDE separates definitions on semicolons and commas with
   # no regard for quotes.  Fortunately VS 7.1 and above are okay.
-  # VS 10 seems to also not like semicolons
   set(SEMICOLON "\;")
 endif()
 

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

Summary of changes:
 Source/CMakeVersion.cmake                 |    2 +-
 Source/cmDocumentCompileDefinitions.h     |    2 +-
 Source/cmVisualStudioGeneratorOptions.cxx |    1 +
 Tests/Preprocess/CMakeLists.txt           |    3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake