[Cmake-commits] CMake branch, next, updated. v3.2.2-2912-gb804271

Brad King brad.king at kitware.com
Mon May 18 14:12:55 EDT 2015


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  b804271ff51f04359d95df453bebcf7dbb7eaa7a (commit)
       via  7ad83ea973a81339a6a1cf2ad82410b955c0329d (commit)
      from  bafa2c57c09c521f3272c7de00cfad408119a905 (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=b804271ff51f04359d95df453bebcf7dbb7eaa7a
commit b804271ff51f04359d95df453bebcf7dbb7eaa7a
Merge: bafa2c5 7ad83ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 14:12:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 14:12:54 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ad83ea973a81339a6a1cf2ad82410b955c0329d
commit 7ad83ea973a81339a6a1cf2ad82410b955c0329d
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:11:04 2015 -0400

    CheckTypeSize: Avoid if() auto-dereferene in quoted arguments (#15571)
    
    Exposed by a CMP0054 warning.  Set CMP0054 to NEW since no code in this
    module depends on the old behavior.

diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 73ad86e..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("${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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list