[Cmake-commits] CMake branch, next, updated. v2.8.5-1476-ga9a6364

[Stephen Kelly]

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  a9a6364a117e437eef3902293820f961bc584cb8 (commit)
       via  44430379b778b71f59d36c52870e5256ab456fd6 (commit)
      from  559c40479c474f9c0fd21edc5b46160964fd70a7 (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=a9a6364a117e437eef3902293820f961bc584cb8
commit a9a6364a117e437eef3902293820f961bc584cb8
Merge: 559c404 4443037
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 07:44:58 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 07:44:58 2011 -0400

    Merge topic 'generate_export_header' into next
    
    4443037 Fix tests with clang.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44430379b778b71f59d36c52870e5256ab456fd6
commit 44430379b778b71f59d36c52870e5256ab456fd6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 13:41:47 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 13:43:48 2011 +0200

    Fix tests with clang.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 4f40b92..fd541dc 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -44,7 +44,7 @@ macro(_do_build Include Library LibrarySource Source)
 
     "add_compiler_export_flags()\n"
 
-    "if(CMAKE_COMPILER_IS_GNUCXX)\n"
+    "if(CMAKE_COMPILER_IS_GNUCXXOR OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))\n"
     "  add_definitions(-Werror)\n"
     "else()\n"
     "  if(MSVC)\n"
@@ -76,10 +76,11 @@ endmacro()
 
 macro(build_fail Include Library LibrarySource Source Message)
   _do_build(${Include} ${Library} ${LibrarySource} "${Source}")
-  if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32)
+  if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32 OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))
     test_fail(Result ${Message})
-  endif()
+  else()
     test_pass(Result ${Message})
+  endif()
 endmacro()
 
 macro(build_pass Include Library LibrarySource Source Message)
@@ -112,7 +113,7 @@ add_subdirectory(lib_shared_and_statictest)
 
 add_subdirectory(override_symbol)
 
-if (CMAKE_COMPILER_IS_GNUCXX)
+if (CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))
   # We deliberately call deprecated methods, and test for that elsewhere.
   # No need to clutter the test output with warnings.
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")

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

Summary of changes:
 Tests/Module/GenerateExportHeader/CMakeLists.txt |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake