CMake: Small cleanup in check_*, take over r29403 to trunk

git-svn-id: https://svn.dealii.org/trunk@29404 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/checks/check_01_compiler_features.cmake b/deal.II/cmake/checks/check_01_compiler_features.cmake
index 8b4ec89a2e307c767ce3ddb208d895c44fc225ab..17063b529ea266812ef5001fc212b02452bb3ef8 100644 (file)
--- a/deal.II/cmake/checks/check_01_compiler_features.cmake
+++ b/deal.II/cmake/checks/check_01_compiler_features.cmake
@@ -148,15 +148,7 @@ CHECK_CXX_SOURCE_COMPILES(
   "
   HAVE_GLIBC_STACKTRACE)
 
-#
-# On Mac OS X, -rdynamic is accepted by the compiler (i.e.
-# it doesn't produce an error) but we always get a warning
-# that it isn't supported. So, only enable -rdynamic on non-Darwin
-# platforms.
-#
-# - Matthias Maier, rewritten 2012
-#
-IF(HAVE_GLIBC_STACKTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+IF(HAVE_GLIBC_STACKTRACE)
   ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-rdynamic")
 ENDIF()
 
@@ -269,10 +261,18 @@ ENDIF()
 # per email by John Fowkes on the mailing list in Feb 2012,
 # so don't run the test on cygwin.
 #
-# - Matthias Maier, rewritten 2012
+# Finally, Intel's icpc compiler complains about the flag
+# but apparently only if the file to be compiled contains
+# particular content. See bug #46 in the Google Code bug
+# data base (http://code.google.com/p/dealii/issues/detail?id=46).
+# It proved impossible to track down under which circumstances
+# this happens, and so it was disabled for icpc.
+#
+# - Matthias Maier, rewritten 2012, 2013
 #
 IF( (NOT CMAKE_SYSTEM_NAME MATCHES "CYGWIN") AND
-    (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") )
+    (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") AND
+    (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") )
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-Wa,--compress-debug-sections")
 ENDIF()
 

diff --git a/deal.II/cmake/checks/check_01_system_features.cmake b/deal.II/cmake/checks/check_02_system_features.cmake
similarity index 93%
rename from deal.II/cmake/checks/check_01_system_features.cmake
rename to deal.II/cmake/checks/check_02_system_features.cmake
index a85e40feccf0fc5e3b2581d980b53c8410802afb..4288bff50b15bf26782670ace74dea74c7137a73 100644 (file)
--- a/deal.II/cmake/checks/check_01_system_features.cmake
+++ b/deal.II/cmake/checks/check_02_system_features.cmake
@@ -82,9 +82,19 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   # this flag any more, so check whether we can indeed do this
   #
   ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS "-Wno-long-double")
+
+  #
+  # On Mac OS X, -rdynamic is accepted by the compiler (i.e.
+  # it doesn't produce an error) but we always get a warning
+  # that it isn't supported.
+  #
+  # TODO: MM: Check whether this is still necessary...
+  #
+  STRIP_FLAG(CMAKE_SHARED_LINKER_FLAGS "-rdynamic")
 ENDIF()
 
 
+
 ###########################################################################
 #                                                                         #
 #                    Windows and CYGWIN specific setup:                   #

diff --git a/deal.II/cmake/checks/check_02_compiler_bugs.cmake b/deal.II/cmake/checks/check_03_compiler_bugs.cmake
similarity index 100%
rename from deal.II/cmake/checks/check_02_compiler_bugs.cmake
rename to deal.II/cmake/checks/check_03_compiler_bugs.cmake