[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2252-g9e9177e

[Rolf Eike Beer]

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  9e9177e30783ed3da0c96b5973ab4219b50b1f41 (commit)
       via  0773ef34e54ab5e2b78a412bb0edc6303cbd9526 (commit)
      from  38f8b0a9484a39d9acbce3f9efb5729c12566ea4 (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=9e9177e30783ed3da0c96b5973ab4219b50b1f41
commit 9e9177e30783ed3da0c96b5973ab4219b50b1f41
Merge: 38f8b0a 0773ef3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Apr 12 06:11:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 12 06:11:06 2014 -0400

    Merge topic 'matches-cleanup' into next
    
    0773ef34 fix CheckTypeSize check


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0773ef34e54ab5e2b78a412bb0edc6303cbd9526
commit 0773ef34e54ab5e2b78a412bb0edc6303cbd9526
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Apr 12 12:09:45 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Apr 12 12:09:45 2014 +0200

    fix CheckTypeSize check

diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index 047b861..ad3b6b5 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -142,9 +142,10 @@ function(__check_type_size_impl type var map builtin language)
     foreach(info ${strings})
       if("${info}" MATCHES "${regex_size}")
         # Get the type size.
+        set(size "${CMAKE_MATCH_1}")
         if(first)
-          set(${var} "${CMAKE_MATCH_1}")
-        elseif(NOT CMAKE_MATCH_1 STREQUAL "${${var}}")
+          set(${var} ${size})
+        elseif(NOT "${size}" STREQUAL "${${var}}")
           set(mismatch 1)
         endif()
         set(first 0)

-----------------------------------------------------------------------

Summary of changes:
 Modules/CheckTypeSize.cmake |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake