[Cmake-commits] CMake branch, next, updated. v3.2.1-1839-g53d490d

[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  53d490d597a79d61de14db75b10b589c72eaef11 (commit)
       via  baef72f2b369b77507969e3362edfc8d7171c43a (commit)
       via  cdc53b62c20605467334ecb80c474533e04ff26c (commit)
      from  a4f0f6ca892491e787e3259d5eba632196e2a4d6 (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=53d490d597a79d61de14db75b10b589c72eaef11
commit 53d490d597a79d61de14db75b10b589c72eaef11
Merge: a4f0f6c baef72f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 14 11:44:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 14 11:44:03 2015 -0400

    Merge topic 'test-xl-preprocess-updates' into next
    
    baef72f2 Tests: Update Preprocess test for XL compiler limitations
    cdc53b62 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=baef72f2b369b77507969e3362edfc8d7171c43a
commit baef72f2b369b77507969e3362edfc8d7171c43a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 14 11:03:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 14 11:03:48 2015 -0400

    Tests: Update Preprocess test for XL compiler limitations

diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 8ff0cfd..15e2aca 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -134,6 +134,15 @@ if((NOT MSVC OR PP_NMAKE) AND
   set(EXPR_OP1 "%")
 endif()
 
+# XL: )(
+# The XL compiler cannot pass unbalanced parens correctly to a tool
+# it launches internally.
+if(CMAKE_C_COMPILER_ID STREQUAL "XL")
+  set(STRING_EXTRA "${STRING_EXTRA}()")
+else()
+  set(STRING_EXTRA "${STRING_EXTRA})(")
+endif()
+
 # General: \"
 # Make tools do not reliably accept \\\" syntax:
 #  - MinGW and MSYS make tools crash with \\\"
@@ -141,7 +150,10 @@ endif()
 #    or $(BACKSLASH)\" where BACKSLASH is a variable set to \\
 #  - VS IDE gets confused about the bounds of the definition value \\\"
 #  - NMake is okay with just \\\"
-if(PP_NMAKE OR PP_UMAKE)
+#  - The XL compiler does not re-escape \\\" when launching an
+#    internal tool to do preprocessing .
+if((PP_NMAKE OR PP_UMAKE) AND
+    NOT CMAKE_C_COMPILER_ID STREQUAL "XL")
   set(STRING_EXTRA "${STRING_EXTRA}\\\"")
 endif()
 
@@ -160,7 +172,7 @@ endif()
 # support it and it is not an operator it is not worthwhile.
 
 # Compose the final test string.
-set(STRING_VALUE "hello`~!@$*)(_+-=}{][:'.?/${STRING_EXTRA}world")
+set(STRING_VALUE "hello`~!@$*_+-=}{][:'.?/${STRING_EXTRA}world")
 
 #-----------------------------------------------------------------------------
 # Function-style macro command-line support:

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

Summary of changes:
 Source/CMakeVersion.cmake       |    2 +-
 Tests/Preprocess/CMakeLists.txt |   16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake