]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 21:36:04 +0000 (21:36 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 21:36:04 +0000 (21:36 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26527 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/check/check_for_compiler_features.cmake
deal.II/contrib/cmake/configure/configure_1_mpi.cmake
deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake

index e7f3c49529c8b1a3aee871cd944f4ef230567ddf..85f590a2b47a1066e55fb7224c32d1bde0d79bc7 100644 (file)
@@ -94,13 +94,7 @@ CHECK_CXX_SOURCE_COMPILES(
 #
 IF(HAVE_GLIBC_STACKTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
-  CHECK_CXX_COMPILER_FLAG(
-    "-rdynamic"
-    DEAL_II_COMPILER_HAS_RDYNAMIC)
-
-  IF(DEAL_II_COMPILER_HAS_RDYNAMIC)
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -rdynamic")
-  ENDIF()
+  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-rdynamic")
 
 ENDIF()
 
index 81f39f5bdf13ee31f2ad5904e0341401b94ef404..d3468f04697b22cda714243828f126d58af23f50 100644 (file)
@@ -17,7 +17,7 @@ MACRO(FEATURE_MPI_CONFIGURE_EXTERNAL var)
 
   INCLUDE_DIRECTORIES(${MPI_CXX_INCLUDE_PATH})
   ADD_FLAGS(CMAKE_CXX_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
-  ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MPI_CXX_LINK_FLAGS}")
+  ADD_FLAGS(CMAKE_SHARED_LINKER_FLAGS "${MPI_CXX_LINK_FLAGS}")
   LIST(APPEND deal_ii_external_libraries ${MPI_CXX_LIBRARIES})
 
   SET(DEAL_II_COMPILER_SUPPORTS_MPI TRUE)
index f643c85bcd8c3dcdb0f23596a4166fb221ca1774..a127f5c1760b5c559d9eef4b27a0a866c481e499 100644 (file)
@@ -105,17 +105,18 @@ ENDIF()
 #                               #
 #################################
 
-#
-# General optimization flags:
-#
-ADD_FLAGS(CMAKE_CXX_FLAGS_RELEASE "-O2")
-
-ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-funroll-loops")
-ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-fstrict-aliasing")
-ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-felide-constructors")
+IF (CMAKE_BUILD_TYPE MATCHES "Release")
+  #
+  # General optimization flags:
+  #
+  ADD_FLAGS(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
-ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-Wno-unused")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-funroll-loops")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-fstrict-aliasing")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-felide-constructors")
 
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-Wno-unused")
+ENDIF()
 
 
 ###############################
@@ -126,17 +127,16 @@ ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_RELEASE "-Wno-unused")
 
 IF (CMAKE_BUILD_TYPE MATCHES "Debug")
   ADD_DEFINITIONS("-DDEBUG")
-ENDIF()
 
-ADD_FLAGS(CMAKE_CXX_FLAGS_DEBUG "-O0")
+  ADD_FLAGS(CMAKE_CXX_FLAGS_DEBUG "-O0")
 
-ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
-ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-ggdb")
-#
-# If -ggdb is not available, fall back to -g:
-#
-IF(NOT DEAL_II_HAVE_FLAG_-ggdb)
-  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-g")
-  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-g")
+  ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+  ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-ggdb")
+  #
+  # If -ggdb is not available, fall back to -g:
+  #
+  IF(NOT DEAL_II_HAVE_FLAG_-ggdb)
+    ENABLE_IF_SUPPORTED(CMAKE_CXX_FLAGS_DEBUG "-g")
+    ENABLE_IF_SUPPORTED(CMAKE_SHARED_LINKER_FLAGS "-g")
+  ENDIF()
 ENDIF()
-

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.