[Cmake-commits] CMake branch, next, updated. v3.2.2-2811-g3447f83
Rolf Eike Beer
eike at sf-mail.de
Sat May 16 16:41:36 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 3447f83e94a958bc5458a8756355201b24acf93e (commit)
via e9d726b1c5f584c0e475b86e09d433c5f22b5cac (commit)
from 9a19e0d8835c72583ee7e66153e378f7308f9a33 (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=3447f83e94a958bc5458a8756355201b24acf93e
commit 3447f83e94a958bc5458a8756355201b24acf93e
Merge: 9a19e0d e9d726b
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat May 16 16:41:35 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 16 16:41:35 2015 -0400
Merge topic 'checktypesize-if' into next
e9d726b1 CheckTypeSize: fix CMP0054 warning (#15571)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9d726b1c5f584c0e475b86e09d433c5f22b5cac
commit e9d726b1c5f584c0e475b86e09d433c5f22b5cac
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat May 16 22:40:46 2015 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat May 16 22:40:46 2015 +0200
CheckTypeSize: fix CMP0054 warning (#15571)
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 73ad86e..597a36d 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
More information about the Cmake-commits
mailing list