]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some renaming
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 08:30:47 +0000 (08:30 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 10 Aug 2012 08:30:47 +0000 (08:30 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@25853 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/modules/prepare_threads.cmake [moved from deal.II/contrib/cmake/modules/deal_ii_with_threads.cmake with 100% similarity]
deal.II/contrib/cmake/modules/prepare_umfpack.cmake [moved from deal.II/contrib/cmake/modules/deal_ii_with_umfpack.cmake with 100% similarity]

index fa73cb60548d20a7028830f82552562ef1324887..8b7a22f1b3a5d6cacb1bfe93b5165b74a2b926f4 100644 (file)
@@ -12,12 +12,28 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true)
 # General configuration options:
 #
 
-OPTION(DEAL_II_USE_CONTRIB "Build and use contrib libraries bundled with the source tarball." ON)
-OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." ON)
-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)
+OPTION(DEAL_II_USE_CONTRIB
+  "Build and use contrib libraries bundled with the source tarball."
+  ON
+  )
+OPTION(DEAL_II_WITH_THREADS
+  "Build deal.II with support for threads. This pulls in libtbb as a dependency."
+  ON
+  )
+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 ;-)
 
 
@@ -28,7 +44,6 @@ OPTION(DEAL_II_WITH_METIS "Build deal.II with support for Metis." OFF)
 
 SET(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
-  # We outsource all the gory details:
   "${CMAKE_SOURCE_DIR}/contrib/cmake/modules/"
   )
 
@@ -42,11 +57,11 @@ ADD_CUSTOM_TARGET(deal_ii_target_dependencies)
 # TODO: Version Mumbo Jumbo
 
 IF(DEAL_II_WITH_THREADS)
-  INCLUDE(deal_ii_with_threads)
+  INCLUDE(preprare_threads)
 ENDIF()
 
 IF(DEAL_II_WITH_UMFPACK)
-  INCLUDE(deal_ii_with_umfpack)
+  INCLUDE(prepare_umfpack)
 ENDIF()
 
 # TODO: The rest...

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.