[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4431-gda16b28

[Daniele E. Domenichelli]

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  da16b288e1339970ec17de01f781b0d2b5c4b3fc (commit)
       via  e04402f002a144fa25cb5973372a226513d9b74b (commit)
      from  d919aa5542c23c063c998064f856a8b3f2996101 (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=da16b288e1339970ec17de01f781b0d2b5c4b3fc
commit da16b288e1339970ec17de01f781b0d2b5c4b3fc
Merge: d919aa5 e04402f
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Sat Oct 5 10:35:56 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 5 10:35:56 2013 -0400

    Merge topic 'CheckStructHasMember_CXX' into next
    
    e04402f CheckStructHasMember: Do not use an empty struct for tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e04402f002a144fa25cb5973372a226513d9b74b
commit e04402f002a144fa25cb5973372a226513d9b74b
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Fri Oct 4 15:43:42 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Fri Oct 4 15:43:42 2013 +0200

    CheckStructHasMember: Do not use an empty struct for tests
    
    Some compilers do not accept that

diff --git a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
index 6902c38..f06d5c3 100644
--- a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
+++ b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
@@ -14,8 +14,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
     message(STATUS "Testing configuration ${_config_type}")
 
     check_struct_has_member("struct non_existent_struct" "foo" "cm_cshm.h" CSHM_RESULT_S1_${_config_type})
-    check_struct_has_member("struct struct_with_non_existent_members" "foo" "cm_cshm.h" CSHM_RESULT_S2_${_config_type})
-    check_struct_has_member("struct struct_with_member" "foo" "cm_cshm.h" CSHM_RESULT_S3_${_config_type})
+    check_struct_has_member("struct struct_with_member" "non_existent_member" "cm_cshm.h" CSHM_RESULT_S2_${_config_type})
+    check_struct_has_member("struct struct_with_member" "member" "cm_cshm.h" CSHM_RESULT_S3_${_config_type})
 
     if(CSHM_RESULT_S1_${_config_type} OR CSHM_RESULT_S2_${_config_type})
         message(SEND_ERROR "CheckStructHasMember reported a nonexistent member as existing in configuration ${_config_type}")
@@ -24,7 +24,6 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
     if(NOT CSHM_RESULT_S3_${_config_type})
         message(SEND_ERROR "CheckStructHasMember did not report an existent member as existing in configuration ${_config_type}")
     endif()
-
 endforeach()
 
 foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
@@ -35,8 +34,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
     message(STATUS "Testing configuration ${_config_type}")
 
     check_struct_has_member("struct non_existent_struct" "foo" "cm_cshm.h" CSHM_RESULT_S1_${_config_type}_C LANGUAGE C)
-    check_struct_has_member("struct struct_with_non_existent_members" "foo" "cm_cshm.h" CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
-    check_struct_has_member("struct struct_with_member" "foo" "cm_cshm.h" CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
+    check_struct_has_member("struct struct_with_member" "non_existent_member" "cm_cshm.h" CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
+    check_struct_has_member("struct struct_with_member" "member" "cm_cshm.h" CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
 
     if(CSHM_RESULT_S1_${_config_type}_C OR CSHM_RESULT_S2_${_config_type}_C)
         message(SEND_ERROR "CheckStructHasMember reported a nonexistent member as existing in configuration ${_config_type}")
@@ -59,8 +58,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
     message(STATUS "Testing configuration ${_config_type}")
 
     check_struct_has_member("non_existent_struct" "foo" "cm_cshm.h" CSHM_RESULT_S1_${_config_type}_CXX LANGUAGE CXX)
-    check_struct_has_member("struct_with_non_existent_members" "foo" "cm_cshm.h" CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE CXX)
-    check_struct_has_member("struct_with_member" "foo" "cm_cshm.h" CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
+    check_struct_has_member("struct_with_non_existent_members" "non_existent_member" "cm_cshm.h" CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE CXX)
+    check_struct_has_member("struct struct_with_member" "member" "cm_cshm.h" CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
     check_struct_has_member("ns::non_existent_class" "foo" "cm_cshm.hxx" CSHM_RESULT_C1_${_config_type}_CXX LANGUAGE CXX)
     check_struct_has_member("ns::class_with_non_existent_members" "foo" "cm_cshm.hxx" CSHM_RESULT_C2_${_config_type}_CXX LANGUAGE CXX)
     check_struct_has_member("ns::class_with_member" "foo" "cm_cshm.hxx" CSHM_RESULT_C3_${_config_type}_CXX LANGUAGE CXX)
diff --git a/Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h b/Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h
index 13ef129..82bb049 100644
--- a/Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h
+++ b/Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h
@@ -2,10 +2,8 @@
 #define _CSHM_DUMMY_H
 
 struct non_existent_struct;
-struct struct_with_non_existent_members {
-};
-struct struct_with_member {
-    int foo;
+struct struct_with_member{
+    int member;
 };
 
 #endif

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

Summary of changes:
 .../CMakeOnly/CheckStructHasMember/CMakeLists.txt  |   13 ++++++-------
 Tests/CMakeOnly/CheckStructHasMember/cm_cshm.h     |    6 ++----
 2 files changed, 8 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake