[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6937-ge1e6a86

[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  e1e6a8601a8b863e89089ea6f38c028c8e05ee15 (commit)
       via  8252406cd6dccb1c62541bb9ea209b4618d9c1f7 (commit)
      from  c321a6ca7f31534a7b56442247c84c2881a85677 (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=e1e6a8601a8b863e89089ea6f38c028c8e05ee15
commit e1e6a8601a8b863e89089ea6f38c028c8e05ee15
Merge: c321a6c 8252406
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 10 09:17:28 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 10 09:17:28 2014 -0500

    Merge topic 'CheckTypeSize_fix_multiple_invocation' into next
    
    8252406 CheckTypeSize: Unset temporary variables when done (#14690)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8252406cd6dccb1c62541bb9ea209b4618d9c1f7
commit 8252406cd6dccb1c62541bb9ea209b4618d9c1f7
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Jan 9 15:57:07 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 10 09:16:30 2014 -0500

    CheckTypeSize: Unset temporary variables when done (#14690)
    
    When the macro is invoked multiple times, the parsing variables were
    not unset and therefore used for all the following calls.

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:


hooks/post-receive
-- 
CMake