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 2fc6ed03e3a5adb756388e93ffb8b0da50f75445 (commit)
via 37136b3ab6ef8beb394475c042aa8d71e82a4413 (commit)
from 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609 (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=2fc6ed03e3a5adb756388e93ffb8b0da50f75445
commit 2fc6ed03e3a5adb756388e93ffb8b0da50f75445
Merge: 5f76ea1 37136b3
Author: Daniele E. Domenichelli <[email protected]>
AuthorDate: Thu Jan 9 10:02:04 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Jan 9 10:02:04 2014 -0500
Merge topic 'CheckTypeSize_fix_multiple_invocation' into next
37136b3 CheckTypeSize: Unset variables used during parsing when no longer
needed
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37136b3ab6ef8beb394475c042aa8d71e82a4413
commit 37136b3ab6ef8beb394475c042aa8d71e82a4413
Author: Daniele E. Domenichelli <[email protected]>
AuthorDate: Thu Jan 9 15:57:07 2014 +0100
Commit: Daniele E. Domenichelli <[email protected]>
CommitDate: Thu Jan 9 15:59:20 2014 +0100
CheckTypeSize: Unset variables used during parsing when no longer needed
When the macro is invoked several time, the parsing variables are not
unset and therefore used for all the following calls.
This fixes issue #14690
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index a9efae4..ec28d8b 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -222,6 +222,8 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
endif()
+ unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
+ unset(_CHECK_TYPE_SIZE_LANGUAGE)
# Compute or load the size or size map.
set(${VARIABLE}_KEYS)
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckTypeSize.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
