]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add the lapack_templates.pl functionality for the meantime...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 22:54:35 +0000 (22:54 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 9 Aug 2012 22:54:35 +0000 (22:54 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25847 0785d39b-7218-0410-832d-ea1e28bc413d

14 files changed:
deal.II/CMakeLists.txt
deal.II/contrib/cmake/modules/deal_ii_with_threads.cmake [new file with mode: 0644]
deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake [new file with mode: 0644]
deal.II/contrib/tbb/CMakeLists.txt
deal.II/include/CMakeLists.txt
deal.II/source/base/CMakeLists.txt
deal.II/source/distributed/CMakeLists.txt
deal.II/source/dofs/CMakeLists.txt
deal.II/source/fe/CMakeLists.txt
deal.II/source/grid/CMakeLists.txt
deal.II/source/hp/CMakeLists.txt
deal.II/source/lac/CMakeLists.txt
deal.II/source/multigrid/CMakeLists.txt
deal.II/source/numerics/CMakeLists.txt

index 0a314878195e15750423344f4b9a90c7a0d743bc..27ac703efa63f55d8ed758f62dd5689d52b46a85 100644 (file)
@@ -12,48 +12,31 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true)
 #
 
 OPTION(DEAL_II_USE_CONTRIB "Build and use contrib libraries bundled with the source tarball." OFF)
-OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK, BLAS and LAPACK." ON)
 OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." ON)
-OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." OFF)
-OPTION(DEAL_II_MPI "Build deal.II with support for openmpi." OFF)
 OPTION(DEAL_II_FUNCTIONPARSER "BUild deal.II with support for functionparser" ON)
+OPTION(DEAL_II_MPI "Build deal.II with support for openmpi." OFF)
+OPTION(DEAL_II_WITH_UMFPACK "Build deal.II with support for UMFPACK, BLAS and LAPACK." ON)
+OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." OFF)
 # TODO: The rest ;-)
 
 
-
 #
 # Configure:
 #
 
 SET(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
+  "${CMAKE_SOURCE_DIR}/contrib/cmake/macros/"
   "${CMAKE_SOURCE_DIR}/contrib/cmake/modules/"
   )
 
-#
-# DEAL_II_WITH_THREADS:
-#
-
 IF(DEAL_II_WITH_THREADS)
-  FIND_PACKAGE(Threads REQUIRED)
-
-  IF(DEAL_II_USE_CONTRIB)
-    # Compiles and links libtbb, exports the TBB_* variables as well:
-    ADD_SUBDIRECTORY(contrib/tbb)
-  ELSE()
-    FIND_PACKAGE(TBB REQUIRED)
-  ENDIF()
-
-  INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR})
-
-  SET(DEAL_II_USE_MT TRUE)
-  SET(DEAL_II_USE_MT_POSIX TRUE)
+  INCLUDE(deal_ii_with_threads)
 ENDIF()
 
-
-#
-#
-#
+IF(DEAL_II_WITH_UMFPACK)
+  INCLUDE(deal_ii_with_umfpack)
+ENDIF()
 
 
 #
@@ -69,10 +52,11 @@ ADD_SUBDIRECTORY(common/expand_instantiations)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include/
+  ${CMAKE_SOURCE_DIR}/contrib/ #TODO
   ${CMAKE_BINARY_DIR}/include/
   )
 
-INCLUDE(${CMAKE_SOURCE_DIR}/contrib/cmake/macros/macro_expand_instantiations.cmake)
+INCLUDE(macro_expand_instantiations)
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(source)
diff --git a/deal.II/contrib/cmake/modules/deal_ii_with_threads.cmake b/deal.II/contrib/cmake/modules/deal_ii_with_threads.cmake
new file mode 100644 (file)
index 0000000..2afd963
--- /dev/null
@@ -0,0 +1,14 @@
+FIND_PACKAGE(Threads REQUIRED)
+
+IF(DEAL_II_USE_CONTRIB)
+  # Compiles and links libtbb, exports the TBB_* variables as well:
+  ADD_SUBDIRECTORY(contrib/tbb)
+ELSE()
+  FIND_PACKAGE(TBB REQUIRED)
+ENDIF()
+
+INCLUDE_DIRECTORIES(${TBB_INCLUDE_DIR})
+# TODO: external_libraries
+
+SET(DEAL_II_USE_MT TRUE)
+SET(DEAL_II_USE_MT_POSIX TRUE)
diff --git a/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake b/deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake
new file mode 100644 (file)
index 0000000..e69de29
index ac3d6c306f9184f0d86c0b09da42515dbeba9234..5ae0b53c48f4f312407f613a51b8fc2b78c5674a 100644 (file)
@@ -9,8 +9,7 @@ ADD_CUSTOM_COMMAND(
 
 ADD_CUSTOM_COMMAND(
   #
-  # TODO: This is very ugly. There should be a better way than calling to a
-  # Makefile...
+  # This makes me very, very sad:
   #
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libtbb_directory}/build
   COMMAND "make"
@@ -23,7 +22,7 @@ ADD_CUSTOM_TARGET(tbb ALL
           ${CMAKE_CURRENT_BINARY_DIR}/${libtbb_directory}/build
   )
 
-ADD_CUSTOM_TARGET(contrib ALL DEPENDS tbb)
+ADD_CUSTOM_TARGET(deal_ii_target_dependencies ALL DEPENDS tbb)
 
 SET(TBB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${libtbb_directory}/include)
 SET(TBB_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libtbb.so)
index 8fc14ed5e29bd7e688103774cfbb920af6ebfa10..f081190bc7f15cb99857a92a80026cd922987cac 100644 (file)
@@ -1,9 +1,21 @@
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/deal.II/lac/lapack_templates.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h
-  )
-
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/deal.II/base/config.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/deal.II/base/config.h
   )
+
+
+#
+#TODO: This perl script has to die...:
+#
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/
+  COMMAND perl
+  ARGS ${CMAKE_SOURCE_DIR}/common/scripts/lapack_templates.pl
+       ${CMAKE_CURRENT_SOURCE_DIR}/deal.II/lac/lapack_templates.h.in
+       > ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h
+  )
+
+ADD_CUSTOM_TARGET(deal_ii_target_dependencies ALL
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/deal.II/lac/lapack_templates.h
+  )
index 14b7d4a8a74bd7f0e62f0b223b70c96386c1e5b8..1a844f9bb42be5c933831d7308d296c3cbf0a04e 100644 (file)
@@ -49,5 +49,5 @@ SET(src_base
   )
 
 ADD_LIBRARY(obj_base OBJECT ${src_base})
-ADD_DEPENDENCIES(obj_base contrib)
+ADD_DEPENDENCIES(obj_base deal_ii_target_dependencies)
 
index 73c7632f019c8ba226cb9415557db788b24b7ac2..44b609ba56d0233a104cc373795044496b8ad3fb 100644 (file)
@@ -12,4 +12,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_distributed OBJECT ${src})
 macro_expand_instantiations(obj_distributed "${inst_in_files}")
-ADD_DEPENDENCIES(obj_distributed contrib)
+ADD_DEPENDENCIES(obj_distributed deal_ii_target_dependencies)
index ad2054e811ca042846a891597d027bebae77f97b..9d3bfd2fb06e75cdfb15b18aec32d88f0be89db6 100644 (file)
@@ -23,4 +23,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_dofs OBJECT ${src})
 macro_expand_instantiations(obj_dofs "${inst_in_files}")
-ADD_DEPENDENCIES(obj_dofs contrib)
+ADD_DEPENDENCIES(obj_dofs deal_ii_target_dependencies)
index 23a92849c3cc280769253f217cc3a0b1ce79751d..a9593060bd3e86928fcc3850bf0a1a16aa104ee5 100644 (file)
@@ -65,4 +65,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_fe OBJECT ${src})
 macro_expand_instantiations(obj_fe "${inst_in_files}")
-ADD_DEPENDENCIES(obj_fe contrib)
+ADD_DEPENDENCIES(obj_fe deal_ii_target_dependencies)
index 844eb6996de8caaea8708cebd075ff5ac0307917..92a498766a8f17ffe54c3fc048ad32e43b212d37 100644 (file)
@@ -32,4 +32,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_grid OBJECT ${src})
 macro_expand_instantiations(obj_grid "${inst_in_files}")
-ADD_DEPENDENCIES(obj_grid contrib)
+ADD_DEPENDENCIES(obj_grid deal_ii_target_dependencies)
index 68979669e8831bc988d39bcf057e71067c039f62..5aad2535144b754de8783d4f9e7f343ea8cc4872 100644 (file)
@@ -17,4 +17,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_hp OBJECT ${src})
 macro_expand_instantiations(obj_hp "${inst_in_files}")
-ADD_DEPENDENCIES(obj_hp contrib)
+ADD_DEPENDENCIES(obj_hp deal_ii_target_dependencies)
index 30df3919c4ab15b32ca912177d3e5d30fdbf29b9..a5a668e65f2efde3b63e16175ea3cc3475c9d57e 100644 (file)
@@ -79,4 +79,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_lac OBJECT ${src})
 macro_expand_instantiations(obj_lac "${inst_in_files}")
-ADD_DEPENDENCIES(obj_lac contrib)
+ADD_DEPENDENCIES(obj_lac deal_ii_target_dependencies)
index e9d1d904df80a3f7d0b97d34d05dd533b8e3c29d..734a5ed9f4462eda1f28c97f4e38490af213e616 100644 (file)
@@ -20,4 +20,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_multigrid OBJECT ${src})
 macro_expand_instantiations(obj_multigrid "${inst_in_files}")
-ADD_DEPENDENCIES(obj_multigrid contrib)
+ADD_DEPENDENCIES(obj_multigrid deal_ii_target_dependencies)
index 9ece9a2ce2d013f312f1794edf75ec5cc94ac7e5..77fd720211482c7f1633343c243525763807eca1 100644 (file)
@@ -42,4 +42,4 @@ SET(inst_in_files
 
 ADD_LIBRARY(obj_numerics OBJECT ${src})
 macro_expand_instantiations(obj_numerics "${inst_in_files}")
-ADD_DEPENDENCIES(obj_numerics contrib)
+ADD_DEPENDENCIES(obj_numerics deal_ii_target_dependencies)

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.