[Cmake-commits] CMake branch, next, updated. v3.2.2-2895-g69ad6cb

[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  69ad6cbdeb72d03e60437908be01ced30dd8ac6a (commit)
       via  92146f3eeb0174900312d9aef52024abb3cb637c (commit)
      from  7af5a973ca97a95158a4c7e0c9f454c1a217cf40 (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=69ad6cbdeb72d03e60437908be01ced30dd8ac6a
commit 69ad6cbdeb72d03e60437908be01ced30dd8ac6a
Merge: 7af5a97 92146f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 10:07:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 10:07:18 2015 -0400

    Merge topic 'CheckTypeSyze-CMP0054' into next
    
    92146f3e CheckTypeSize: Avoid if() auto-dereferene in quoted arguments (#15571)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92146f3eeb0174900312d9aef52024abb3cb637c
commit 92146f3eeb0174900312d9aef52024abb3cb637c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 10:04:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 18 10:06:02 2015 -0400

    CheckTypeSize: Avoid if() auto-dereferene in quoted arguments (#15571)
    
    Exposed by a CMP0054 warning.

diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 73ad86e..dd5c647 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -112,9 +112,9 @@ function(__check_type_size_impl type var map builtin language)
 
   # Perform the check.
 
-  if("${language}" STREQUAL "C")
+  if("x${language}" STREQUAL "xC")
     set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
-  elseif("${language}" STREQUAL "CXX")
+  elseif("x${language}" STREQUAL "xCXX")
     set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.cpp)
   else()
     message(FATAL_ERROR "Unknown language:\n  ${language}\nSupported languages: C, CXX.\n")
@@ -229,11 +229,11 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
     set(_builtin 0)
   else()
     set(_builtin 1)
-    if("${_language}" STREQUAL "C")
+    if("x${_language}" STREQUAL "xC")
       check_include_file(sys/types.h HAVE_SYS_TYPES_H)
       check_include_file(stdint.h HAVE_STDINT_H)
       check_include_file(stddef.h HAVE_STDDEF_H)
-    elseif("${_language}" STREQUAL "CXX")
+    elseif("x${_language}" STREQUAL "xCXX")
       check_include_file_cxx(sys/types.h HAVE_SYS_TYPES_H)
       check_include_file_cxx(stdint.h HAVE_STDINT_H)
       check_include_file_cxx(stddef.h HAVE_STDDEF_H)

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

Summary of changes:
 Modules/CheckTypeSize.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake