[Cmake-commits] CMake branch, next, updated. v3.2.2-2968-g56e2026
Brad King
brad.king at kitware.com
Tue May 19 13:03:52 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 56e20260aa6862f8b049a09be9ecfc068f2c217c (commit)
via 6784f0a6eb21a3b6a0969aa08482ba7e3b23fa20 (commit)
from 4580bb389a0d8c07fe3227fc56ed6b666d390cc3 (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=56e20260aa6862f8b049a09be9ecfc068f2c217c
commit 56e20260aa6862f8b049a09be9ecfc068f2c217c
Merge: 4580bb3 6784f0a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 19 13:03:52 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 19 13:03:52 2015 -0400
Merge topic 'CheckTypeSyze-CMP0054' into next
6784f0a6 CheckTypeSize: Avoid if() auto-dereferene in quoted arguments (#15571)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6784f0a6eb21a3b6a0969aa08482ba7e3b23fa20
commit 6784f0a6eb21a3b6a0969aa08482ba7e3b23fa20
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: Tue May 19 12:47:24 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..8c7acb5 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -83,6 +83,7 @@ include(CheckIncludeFileCXX)
cmake_policy(PUSH)
cmake_policy(VERSION 3.0)
+cmake_policy(SET CMP0054 NEW)
get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -112,9 +113,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 +230,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