]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Reorganize includes and the general layout under contrib/cmake
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 22:13:36 +0000 (22:13 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 17 Sep 2012 22:13:36 +0000 (22:13 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26458 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/check/check_for_compiler_bugs.cmake
deal.II/contrib/cmake/check/check_for_compiler_features.cmake
deal.II/contrib/cmake/check/check_for_cxx_features.cmake
deal.II/contrib/cmake/configure/configure_blas.cmake
deal.II/contrib/cmake/configure/configure_tbb.cmake
deal.II/contrib/cmake/configure/configure_trilinos.cmake
deal.II/contrib/cmake/setup_cached_variables.cmake [moved from deal.II/contrib/cmake/configure/setup_cached_variables.cmake with 100% similarity]
deal.II/contrib/cmake/setup_deal_ii.cmake [moved from deal.II/contrib/cmake/configure/setup_deal_ii.cmake with 100% similarity]
deal.II/contrib/cmake/setup_external_macros.cmake [new file with mode: 0644]

index d52358bc850300dfd29658133b987578b41dd395..25a329e30029bce99e652cfb10ac1e8f64a8d119 100644 (file)
@@ -176,11 +176,10 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true)
 
 SET(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
+  "${CMAKE_SOURCE_DIR}/contrib/cmake/"
   "${CMAKE_SOURCE_DIR}/contrib/cmake/modules/"
-  "${CMAKE_SOURCE_DIR}/contrib/cmake/configure/"
   )
 
-
 #
 # Load all macros:
 #
@@ -190,6 +189,8 @@ FOREACH(file ${macro_files})
   INCLUDE(${file})
 ENDFOREACH()
 
+INCLUDE(setup_external_macros)
+
 
 #
 # We have to initialize some cached variable before PROJECT is called, so
index e2293a41b6395f029cd2e64160795737da10a115..ca7fae17c19d18572c2b61277733efa950b97d07 100644 (file)
@@ -1,12 +1,8 @@
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckIncludeFiles)
-
 #
 # Check for various compiler bugs:
 #
 
 
-
 #
 # Versions of GCC before 3.0 had a problem with the explicit
 # instantiation of member templates when the member was in fact
index 63e8dcb03e0e6ec2e91a13f42773270785c7d01f..dcfc7fd2e52fe399369508bec70aa6073ab958bc 100644 (file)
@@ -1,8 +1,3 @@
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckCXXCompilerFlag)
-INCLUDE(CheckCXXSourceRuns)
-
-
 #
 # Check for various compiler features.
 #
index b405c9980ae2c9b0e6c7e95d4981bebe560f3e80..2fd7f860ca0a5dd15eaa0c38f53247d12bdf1ec5 100644 (file)
@@ -1,8 +1,3 @@
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckCXXCompilerFlag)
-INCLUDE(CheckCXXSourceRuns)
-INCLUDE(CheckIncludeFiles)
-
 #
 # Check for various C++ language features
 #
index 3f12dc282def466e5c8f43025d3bea60255545aa..ae48d4cebb87c0e2c3bcf9b42b2a2e73e03b7445 100644 (file)
@@ -2,8 +2,6 @@
 # Configuration for the blas library:
 #
 
-INCLUDE(CheckFunctionExists)
-
 MACRO(FEATURE_BLAS_FIND_EXTERNAL var)
 
   FIND_PACKAGE(BLAS)
index 1a56771c3f4cddffb3805eb8e9aafc7c31b3de5e..f314bf1428ad0330dcf9ec956b8de4c7d018e6ff 100644 (file)
@@ -2,7 +2,6 @@
 # Configuration for the tbb library:
 #
 
-INCLUDE(CheckCXXSourceCompiles)
 
 #
 # Set up genereal threading. The macro will be included in
index c0ce95bb3109aded219fc26cdf67eaaee14c7514..ff074eeb99e25ff3c1334d3fd3242852948161a9 100644 (file)
@@ -2,9 +2,6 @@
 # Configuration for the trilinos library:
 #
 
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckIncludeFile)
-
 
 MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
 
diff --git a/deal.II/contrib/cmake/setup_external_macros.cmake b/deal.II/contrib/cmake/setup_external_macros.cmake
new file mode 100644 (file)
index 0000000..415c848
--- /dev/null
@@ -0,0 +1,9 @@
+#
+# Include all external (cmake) macros that we will use:
+#
+
+INCLUDE(CheckCXXCompilerFlag)
+INCLUDE(CheckCXXSourceCompiles)
+INCLUDE(CheckCXXSourceRuns)
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckIncludeFiles)

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.