]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 09:13:05 +0000 (09:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 09:13:05 +0000 (09:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26822 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_arpack.cmake
deal.II/cmake/macros/macro_pop_test_flag.cmake [new file with mode: 0644]
deal.II/cmake/macros/macro_push_test_flag.cmake [new file with mode: 0644]

index 7be95828450f51d9272093f21bafd0cf1eec894e..537d83bc9b71ae8e4a648f472a02ec0bd42d969b 100644 (file)
@@ -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 (file)
index 0000000..70e421d
--- /dev/null
@@ -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 (file)
index 0000000..c8aed8d
--- /dev/null
@@ -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()
+

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.