[Cmake-commits] CMake branch, next, updated. v3.2.2-2910-gbafa2c5

[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  bafa2c57c09c521f3272c7de00cfad408119a905 (commit)
       via  61857575f8e2ddebe93cc48b9cc0901fd01640d6 (commit)
      from  04d08d4da99cd14aa6cbb5086850cda25df72c6b (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=bafa2c57c09c521f3272c7de00cfad408119a905
commit bafa2c57c09c521f3272c7de00cfad408119a905
Merge: 04d08d4 6185757
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 14:10:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 14:10:08 2015 -0400

    Merge topic 'CheckTypeSyze-CMP0054' into next
    
    61857575 CheckTypeSize: fix CMP0054 warning (#15571)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61857575f8e2ddebe93cc48b9cc0901fd01640d6
commit 61857575f8e2ddebe93cc48b9cc0901fd01640d6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat May 16 22:40:46 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 18 14:09:18 2015 -0400

    CheckTypeSize: fix CMP0054 warning (#15571)

diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index dd5c647..c56feb8 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -82,7 +82,7 @@ include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
 
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.0)
+cmake_policy(VERSION 3.2)
 
 get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
@@ -112,9 +112,9 @@ function(__check_type_size_impl type var map builtin language)
 
   # Perform the check.
 
-  if("x${language}" STREQUAL "xC")
+  if(language STREQUAL "C")
     set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
-  elseif("x${language}" STREQUAL "xCXX")
+  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("x${_language}" STREQUAL "xC")
+    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("x${_language}" STREQUAL "xCXX")
+    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 |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake