diff options
| author | Stephen Kelly <steveire@gmail.com> | 2011-08-10 11:41:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2011-08-10 11:43:48 (GMT) |
| commit | 44430379b778b71f59d36c52870e5256ab456fd6 (patch) | |
| tree | 90a12b43384dbbd5f886c7108bc812429f199ada /Tests/Module | |
| parent | ffaa127b191a6be0463160dd433b513ce28d8fe9 (diff) | |
| download | CMake-44430379b778b71f59d36c52870e5256ab456fd6.zip CMake-44430379b778b71f59d36c52870e5256ab456fd6.tar.gz CMake-44430379b778b71f59d36c52870e5256ab456fd6.tar.bz2 | |
Fix tests with clang.
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/GenerateExportHeader/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
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") |