[Cmake-commits] CMake branch, next, updated. v3.2.2-2893-g7af5a97

[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  7af5a973ca97a95158a4c7e0c9f454c1a217cf40 (commit)
       via  5d08782016e1c0191b4bd8f85270e63f80f76486 (commit)
      from  8c0ef47a4188b61bc07f8adb031af6a826aa500c (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=7af5a973ca97a95158a4c7e0c9f454c1a217cf40
commit 7af5a973ca97a95158a4c7e0c9f454c1a217cf40
Merge: 8c0ef47 5d08782
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 10:03:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 10:03:45 2015 -0400

    Merge topic 'checktypesize-if' into next
    
    5d087820 Revert "CheckTypeSize: fix CMP0054 warning (#15571)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d08782016e1c0191b4bd8f85270e63f80f76486
commit 5d08782016e1c0191b4bd8f85270e63f80f76486
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 10:03:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 18 10:03:32 2015 -0400

    Revert "CheckTypeSize: fix CMP0054 warning (#15571)"
    
    This reverts commit e9d726b1c5f584c0e475b86e09d433c5f22b5cac.

diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 597a36d..73ad86e 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("${language}" STREQUAL "C")
     set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
-  elseif(language STREQUAL "CXX")
+  elseif("${language}" STREQUAL "CXX")
     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("${_language}" STREQUAL "C")
       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("${_language}" STREQUAL "CXX")
       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