From 4148144cfe517747069e794b4ee884f0e5e67d30 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 19 Sep 2012 21:36:04 +0000 Subject: [PATCH] Bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26527 0785d39b-7218-0410-832d-ea1e28bc413d --- .../check/check_for_compiler_features.cmake | 8 +--- .../cmake/configure/configure_1_mpi.cmake | 2 +- .../cmake/setup_compiler_flags_gnu.cmake | 40 +++++++++---------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/deal.II/contrib/cmake/check/check_for_compiler_features.cmake b/deal.II/contrib/cmake/check/check_for_compiler_features.cmake index e7f3c49529..85f590a2b4 100644 --- a/deal.II/contrib/cmake/check/check_for_compiler_features.cmake +++ b/deal.II/contrib/cmake/check/check_for_compiler_features.cmake @@ -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() diff --git a/deal.II/contrib/cmake/configure/configure_1_mpi.cmake b/deal.II/contrib/cmake/configure/configure_1_mpi.cmake index 81f39f5bdf..d3468f0469 100644 --- a/deal.II/contrib/cmake/configure/configure_1_mpi.cmake +++ b/deal.II/contrib/cmake/configure/configure_1_mpi.cmake @@ -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) diff --git a/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake b/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake index f643c85bcd..a127f5c176 100644 --- a/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/contrib/cmake/setup_compiler_flags_gnu.cmake @@ -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() - -- 2.39.5