From 2a8f8bf3a2368940cfea57c2284fa0f8a817da17 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 28 Sep 2012 09:13:05 +0000 Subject: [PATCH] ... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26822 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/configure/configure_arpack.cmake | 4 ---- .../cmake/macros/macro_pop_test_flag.cmake | 19 +++++++++++++++++++ .../cmake/macros/macro_push_test_flag.cmake | 13 +++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 deal.II/cmake/macros/macro_pop_test_flag.cmake create mode 100644 deal.II/cmake/macros/macro_push_test_flag.cmake diff --git a/deal.II/cmake/configure/configure_arpack.cmake b/deal.II/cmake/configure/configure_arpack.cmake index 7be9582845..537d83bc9b 100644 --- a/deal.II/cmake/configure/configure_arpack.cmake +++ b/deal.II/cmake/configure/configure_arpack.cmake @@ -2,10 +2,6 @@ # Configuration for the ARPACK library: # -SET(FEATURE_ARPACK_DEPENDS - DEAL_II_WITH_BLAS - ) - MACRO(FEATURE_ARPACK_FIND_EXTERNAL var) FIND_PACKAGE(ARPACK) diff --git a/deal.II/cmake/macros/macro_pop_test_flag.cmake b/deal.II/cmake/macros/macro_pop_test_flag.cmake new file mode 100644 index 0000000000..70e421d7a7 --- /dev/null +++ b/deal.II/cmake/macros/macro_pop_test_flag.cmake @@ -0,0 +1,19 @@ +# +# A small macro used in the platform checks to remove the right most flag in +# CMAKE_REQUIRED_FLAGS +# +# We assume that the flags in CMAKE_REQUIRED_FLAGS are space separated +# +# Usage: +# POP_TEST_FLAG() +# + +MACRO(ADD_TEST_FLAG flag) + SET(CMAKE_REQUIRED_FLAGS " ${CMAKE_REQUIRED_FLAGS}") + STRING(REGEX_REPLACE " -[^ ]+$" "" + CMAKE_REQUIRED_FLAGS + "${CMAKE_REQUIRED_FLAGS}" + ) + STRING(STRIP "${CMAKE_REQUIRED_FLAGS}" CMAKE_REQUIRED_FLAGS) +ENDMACRO() + diff --git a/deal.II/cmake/macros/macro_push_test_flag.cmake b/deal.II/cmake/macros/macro_push_test_flag.cmake new file mode 100644 index 0000000000..c8aed8d322 --- /dev/null +++ b/deal.II/cmake/macros/macro_push_test_flag.cmake @@ -0,0 +1,13 @@ +# +# A small macro used in the platform checks to easily add a flag to +# CMAKE_REQUIRED_FLAGS +# +# Usage: +# PUSH_TEST_FLAG("flag") +# + +MACRO(ADD_TEST_FLAG flag) + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}") + STRING(STRIP "${CMAKE_REQUIRED_FLAGS}" CMAKE_REQUIRED_FLAGS) +ENDMACRO() + -- 2.39.5