summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-08-10 09:34:31 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-08-10 09:54:35 (GMT)
commitffaa127b191a6be0463160dd433b513ce28d8fe9 (patch)
treecd5ebd9cb31c232be8abb1aadc37469d4efb8a2a
parent6aca0e257be36949299b28cbfa12225269e28a03 (diff)
downloadCMake-ffaa127b191a6be0463160dd433b513ce28d8fe9.zip
CMake-ffaa127b191a6be0463160dd433b513ce28d8fe9.tar.gz
CMake-ffaa127b191a6be0463160dd433b513ce28d8fe9.tar.bz2
Test expected no-op instead of aborting the build.
Aborting causes make clean to fail if the executable is not created.
-rw-r--r--Tests/Module/GenerateExportHeader/CMakeLists.txt11
1 files changed, 4 insertions, 7 deletions
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()