From 506750edc4a2fa4fdd19700ddbaec1fbaadb2e65 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 24 Nov 2012 01:16:48 +0000 Subject: [PATCH] Cosmetic changes git-svn-id: https://svn.dealii.org/branches/branch_cmake@27677 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_1_threads.cmake | 4 ++-- deal.II/cmake/macros/macro_enable_if_links.cmake | 6 ++++-- deal.II/cmake/setup_compiler_flags_gnu.cmake | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deal.II/cmake/configure/configure_1_threads.cmake b/deal.II/cmake/configure/configure_1_threads.cmake index 9b66de53d4..325b6d395f 100644 --- a/deal.II/cmake/configure/configure_1_threads.cmake +++ b/deal.II/cmake/configure/configure_1_threads.cmake @@ -43,9 +43,9 @@ MACRO(SETUP_THREADING var) # IF("${CMAKE_THREAD_LIBS_INIT}" MATCHES "-lpthread") CHECK_CXX_COMPILER_FLAG("-pthread" - DEAL_II_HAVE_FLAG_-pthread + DEAL_II_HAVE_FLAG_pthread ) - IF(DEAL_II_HAVE_FLAG_-pthread) + IF(DEAL_II_HAVE_FLAG_pthread) STRING(REPLACE "-lpthread" "-pthread" CMAKE_THREAD_LIBS_INIT "${CMAKE_THREAD_LIBS_INIT}" ) diff --git a/deal.II/cmake/macros/macro_enable_if_links.cmake b/deal.II/cmake/macros/macro_enable_if_links.cmake index 462dc7a400..5a8525afe3 100644 --- a/deal.II/cmake/macros/macro_enable_if_links.cmake +++ b/deal.II/cmake/macros/macro_enable_if_links.cmake @@ -22,15 +22,17 @@ # MACRO(ENABLE_IF_LINKS _variable _flag) + STRING(REGEX REPLACE "^-" "" _flag_name "${_flag}") + ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${_flag}") CHECK_CXX_SOURCE_COMPILES( " int main() { return 0; } " - DEAL_II_HAVE_FLAG_${_flag} + DEAL_II_HAVE_FLAG_${_flag_name} ) STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${_flag}") - IF(DEAL_II_HAVE_FLAG_${_flag}) + IF(DEAL_II_HAVE_FLAG_${_flag_name}) SET(${_variable} "${${_variable}} ${_flag}") ENDIF() ENDMACRO() diff --git a/deal.II/cmake/setup_compiler_flags_gnu.cmake b/deal.II/cmake/setup_compiler_flags_gnu.cmake index 4799abadde..70fa3595dd 100644 --- a/deal.II/cmake/setup_compiler_flags_gnu.cmake +++ b/deal.II/cmake/setup_compiler_flags_gnu.cmake @@ -137,7 +137,7 @@ IF (CMAKE_BUILD_TYPE MATCHES "Debug") # # If -ggdb is not available, fall back to -g: # - IF(NOT DEAL_II_HAVE_FLAG_-ggdb) + IF(NOT DEAL_II_HAVE_FLAG_ggdb) ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_DEBUG "-g") ENABLE_IF_SUPPORTED(DEAL_II_SHARED_LINKER_FLAGS_DEBUG "-g") ENDIF() -- 2.39.5