[Cmake-commits] CMake branch, next, updated. v3.6.2-1865-g6f43ab3
Brad King
brad.king at kitware.com
Thu Sep 8 14:59:48 EDT 2016
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 6f43ab3049540f3a0c62c50d9e6b43f10fa57897 (commit)
via b00a344d11386940bb57c9e4321d95a82555f044 (commit)
from 37d5107091a9713090f73406b87053a05817c882 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f43ab3049540f3a0c62c50d9e6b43f10fa57897
commit 6f43ab3049540f3a0c62c50d9e6b43f10fa57897
Merge: 37d5107 b00a344
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 8 14:59:47 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 8 14:59:47 2016 -0400
Merge topic 'geh-failure-tests' into next
b00a344d Maybe skip GenerateExportHeader failure tests
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00a344d11386940bb57c9e4321d95a82555f044
commit b00a344d11386940bb57c9e4321d95a82555f044
Author: Matthew Woehlke <matthew.woehlke at kitware.com>
AuthorDate: Thu Sep 8 14:47:18 2016 -0400
Commit: Matthew Woehlke <matthew.woehlke at kitware.com>
CommitDate: Thu Sep 8 14:47:18 2016 -0400
Maybe skip GenerateExportHeader failure tests
When setting up the failure tests for GenerateExportHeader, check if the
compiler actually hides non-exported stuff. If not, the failure tests
won't fail, and will cause the overall test to fail. (Since this
typically is only the case for very old compilers, simply skipping them
as opposed to trying to do something more fine grained seems reasonably
safe.)
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake b/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
index 88853b3..7182cdf 100644
--- a/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake
@@ -2,6 +2,13 @@ set(failure_test_executables
${CMAKE_CURRENT_BINARY_DIR}/failure_test_targets)
file(WRITE ${failure_test_executables} "")
+# Check if we should do anything. If the compiler doesn't support hidden
+# visibility, the failure tests won't fail, so just write an empty targets
+# list and punt.
+if(NOT WIN32 AND NOT CYGWIN AND NOT COMPILER_HAS_HIDDEN_VISIBILITY)
+ return()
+endif()
+
# Read the input source file
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/exportheader_test.cpp content_post)
set(content_pre "")
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/GenerateExportHeader/GEH-failures.cmake | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list