[Cmake-commits] CMake branch, next, updated. v2.8.5-1524-gfdbcbae
Stephen Kelly
steveire at gmail.com
Fri Aug 12 04:48:19 EDT 2011
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 fdbcbae5820c8a681c9edfb1419a0aabfe8f8869 (commit)
via 01e9e983e31dcd33bd5991b67e131e80e37f86e1 (commit)
via 9aab2aa77f12a938ef4a819ebb9830a1918f65ce (commit)
from c070dbe4e53a87a92da6d2c36f9a1bfd49479188 (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=fdbcbae5820c8a681c9edfb1419a0aabfe8f8869
commit fdbcbae5820c8a681c9edfb1419a0aabfe8f8869
Merge: c070dbe 01e9e98
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 12 04:48:15 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 12 04:48:15 2011 -0400
Merge topic 'generate_export_header' into next
01e9e98 Test -Werror instead of enabling it per compiler.
9aab2aa Expect the tests to pass if hidden visibilty is not enabled.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01e9e983e31dcd33bd5991b67e131e80e37f86e1
commit 01e9e983e31dcd33bd5991b67e131e80e37f86e1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 12 10:47:08 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 12 10:47:08 2011 +0200
Test -Werror instead of enabling it per compiler.
Maybe the Intel compiler supports it too.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index febf90f..b3f646f 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -46,7 +46,9 @@ macro(_do_build Include Library LibrarySource Source)
"add_compiler_export_flags()\n"
- "if(CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))\n"
+ "check_cxx_compiler_flag(-Werror HAS_WERROR_FLAG)\n"
+
+ "if(HAS_WERROR_FLAG)\n"
" add_definitions(-Werror)\n"
"else()\n"
" if(MSVC AND COMPILER_HAS_DEPRECATED)\n"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9aab2aa77f12a938ef4a819ebb9830a1918f65ce
commit 9aab2aa77f12a938ef4a819ebb9830a1918f65ce
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 12 10:42:16 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 12 10:42:16 2011 +0200
Expect the tests to pass if hidden visibilty is not enabled.
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
index 1401eec..28d6c65 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
@@ -25,4 +25,9 @@ else()
static_variant_build_pass("return libshared_and_static_deprecated();" "Built static deprecated variant")
endif()
static_variant_build_pass("return libshared_and_static_not_exported();" "Failed to build static not exported variant")
-shared_variant_build_fail("return libshared_and_static_not_exported();" "Built shared not exported variant")
+
+if (WIN32 OR COMPILER_HAS_HIDDEN_VISIBILITY)
+ shared_variant_build_fail("return libshared_and_static_not_exported();" "Built shared not exported variant")
+else()
+ shared_variant_build_pass("return libshared_and_static_not_exported();" "Built shared not exported variant")
+endif()
diff --git a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
index b763036..288089e 100644
--- a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
@@ -20,12 +20,25 @@ else()
# There is no MSVC equivalent to hiding symbols.
shared_build_pass("Libshared l; return l.libshared_excluded();" "Built use of excluded class method. This is possible on MSVC.")
endif()
-shared_build_fail("LibsharedNotExported l; return l.libshared();" "Built use of not-exported class method. This should not be possible.")
-shared_build_fail("LibsharedNotExported l; return l.libshared_not_exported();" "Built use of not-exported class method. This should not be possible.")
-shared_build_fail("LibsharedNotExported l; return l.libshared_excluded();" "Built use of not-exported class method. This should not be possible.")
-shared_build_fail("LibsharedExcluded l; return l.libshared();" "Built use of excluded class method. This should not be possible.")
-shared_build_fail("LibsharedExcluded l; return l.libshared_not_exported();" "Built use of excluded class method. This should not be possible.")
-shared_build_fail("LibsharedExcluded l; return l.libshared_excluded();" "Built use of excluded class method. This should not be possible.")
-shared_build_fail("return libshared_excluded();" "Built use of excluded function. This should not be possible.")
-shared_build_fail("return libshared_not_exported();" "Built use of not-exported function. This should not be possible.")
+if (WIN32 OR COMPILER_HAS_HIDDEN_VISIBILITY)
+ shared_build_fail("LibsharedNotExported l; return l.libshared();" "Built use of not-exported class method. This should not be possible.")
+ shared_build_fail("LibsharedNotExported l; return l.libshared_not_exported();" "Built use of not-exported class method. This should not be possible.")
+ shared_build_fail("LibsharedNotExported l; return l.libshared_excluded();" "Built use of not-exported class method. This should not be possible.")
+ shared_build_fail("LibsharedExcluded l; return l.libshared();" "Built use of excluded class method. This should not be possible.")
+ shared_build_fail("LibsharedExcluded l; return l.libshared_not_exported();" "Built use of excluded class method. This should not be possible.")
+ shared_build_fail("LibsharedExcluded l; return l.libshared_excluded();" "Built use of excluded class method. This should not be possible.")
+
+ shared_build_fail("return libshared_excluded();" "Built use of excluded function. This should not be possible.")
+ shared_build_fail("return libshared_not_exported();" "Built use of not-exported function. This should not be possible.")
+else()
+ shared_build_pass("LibsharedNotExported l; return l.libshared();" "Built use of not-exported class method.")
+ shared_build_pass("LibsharedNotExported l; return l.libshared_not_exported();" "Built use of not-exported class method.")
+ shared_build_pass("LibsharedNotExported l; return l.libshared_excluded();" "Built use of not-exported class method.")
+ shared_build_pass("LibsharedExcluded l; return l.libshared();" "Built use of excluded class method.")
+ shared_build_pass("LibsharedExcluded l; return l.libshared_not_exported();" "Built use of excluded class method.")
+ shared_build_pass("LibsharedExcluded l; return l.libshared_excluded();" "Built use of excluded class method.")
+
+ shared_build_pass("return libshared_excluded();" "Built use of excluded function.")
+ shared_build_pass("return libshared_not_exported();" "Built use of not-exported function.")
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 ++-
.../lib_shared_and_statictest/CMakeLists.txt | 7 ++++-
.../libsharedtest/CMakeLists.txt | 29 ++++++++++++++-----
3 files changed, 30 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list