[Cmake-commits] CMake branch, next, updated. v2.8.5-1474-g559c404

[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  559c40479c474f9c0fd21edc5b46160964fd70a7 (commit)
       via  ffaa127b191a6be0463160dd433b513ce28d8fe9 (commit)
      from  e99c097f485d7019cdb944d4ea9ddf6c51d420b0 (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=559c40479c474f9c0fd21edc5b46160964fd70a7
commit 559c40479c474f9c0fd21edc5b46160964fd70a7
Merge: e99c097 ffaa127
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 05:56:06 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 05:56:06 2011 -0400

    Merge topic 'generate_export_header' into next
    
    ffaa127 Test expected no-op instead of aborting the build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffaa127b191a6be0463160dd433b513ce28d8fe9
commit ffaa127b191a6be0463160dd433b513ce28d8fe9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 11:34:31 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 11:54:35 2011 +0200

    Test expected no-op instead of aborting the build.
    
    Aborting causes make clean to fail if the executable is not created.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 52fe79f..4f40b92 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -76,7 +76,10 @@ endmacro()
 
 macro(build_fail Include Library LibrarySource Source Message)
   _do_build(${Include} ${Library} ${LibrarySource} "${Source}")
-  test_fail(Result ${Message})
+  if((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32)
+    test_fail(Result ${Message})
+  endif()
+    test_pass(Result ${Message})
 endmacro()
 
 macro(build_pass Include Library LibrarySource Source Message)
@@ -88,12 +91,6 @@ include(GenerateExportHeader)
 
 add_compiler_export_flags()
 
-if(NOT ((USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY) OR WIN32))
-  message(WARNING "Compiler does not support export feature")
-  return()
-endif()
-
-
 if (MSVC)
   add_definitions(-DCOMPILER_IS_MSVC)
 endif()

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

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


hooks/post-receive
-- 
CMake