]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfixes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 14 Sep 2012 14:32:15 +0000 (14:32 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 14 Sep 2012 14:32:15 +0000 (14:32 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26383 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_tbb.cmake
deal.II/contrib/cmake/macros/macro_configure_feature.cmake

index 60e041c904db15dce10962a709916a850c900988..28fef9b25b654d6ce7191d6b4c4f7c9c0671db1e 100644 (file)
@@ -88,7 +88,7 @@ OPTION(DEAL_II_FEATURE_AUTODETECTION
 
 OPTION(DEAL_II_WITH_BLAS
   "Build deal.II with support for BLAS."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_FUNCTIONPARSER
   "Build deal.II with support for functionparser."
@@ -96,7 +96,7 @@ OPTION(DEAL_II_WITH_FUNCTIONPARSER
 
 OPTION(DEAL_II_WITH_LAPACK
   "Build deal.II with support for LAPACK."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_METIS
   "Build deal.II with support for Metis."
@@ -112,11 +112,11 @@ OPTION(DEAL_II_WITH_NETCDF
 
 OPTION(DEAL_II_WITH_TBB
   "Build deal.II with support for tbb. This will enable thread support in deal.II."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_UMFPACK
   "Build deal.II with support for UMFPACK."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_ZLIB
   "Build deal.II with support for zlib."
@@ -140,7 +140,7 @@ OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER
 
 OPTION(DEAL_II_FORCE_CONTRIB_BOOST
   "Always use the bundled boost library instead of an external one."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_FORCE_CONTRIB_TBB
   "Always use the bundled tbb library instead of an external one."
@@ -244,11 +244,11 @@ SET(deal_ii_external_libraries)
 # Run all system checks:
 #
 
-#FILE(GLOB check_files "contrib/cmake/check/*.cmake")
-#FOREACH(file ${check_files})
-#  MESSAGE(STATUS "Include ${file}")
-#  INCLUDE(${file})
-#ENDFOREACH()
+FILE(GLOB check_files "contrib/cmake/check/*.cmake")
+FOREACH(file ${check_files})
+  MESSAGE(STATUS "Include ${file}")
+  INCLUDE(${file})
+ENDFOREACH()
 
 
 #
@@ -257,6 +257,8 @@ SET(deal_ii_external_libraries)
 
 INCLUDE(configure_blas)
 INCLUDE(configure_lapack)
+
+# configure_boost depends on configure_blas and configure_lapack
 INCLUDE(configure_umfpack)
 
 INCLUDE(configure_functionparser)
@@ -267,8 +269,7 @@ INCLUDE(configure_netcdf)
 
 INCLUDE(configure_tbb)
 
-# Boost has to be incluted after threads because it depends on the thread
-# configuration
+# configure_boost depends on configure_tbb
 INCLUDE(configure_boost)
 
 INCLUDE(configure_zlib)
index 52b6a89771902d2a202f5d1cf3c08846f3a1affd..201263e3533f10ad20bf0a8a51b8111be94ea0d7 100644 (file)
@@ -94,7 +94,7 @@ MACRO(FIND_FEATURE_TBB_EXTERNAL var)
   ENDIF()
 
   IF(TBB_FOUND)
-    SET(${var} TRUE)
+    #SET(${var} TRUE)
   ENDIF()
 
 ENDMACRO()
@@ -118,7 +118,7 @@ ENDMACRO()
 SET(HAVE_CONTRIB_FEATURE_TBB TRUE)
 
 
-MACRO(CONFIGURE_FEATURE_BOOST_CONTRIB var)
+MACRO(CONFIGURE_FEATURE_TBB_CONTRIB var)
   #
   # Add tbb directly to the object files of deal.II
   #
@@ -138,4 +138,22 @@ MACRO(CONFIGURE_FEATURE_BOOST_CONTRIB var)
 ENDMACRO()
 
 
+MACRO(CONFIGURE_FEATURE_TBB_ERROR_MESSAGE)
+    MESSAGE(SEND_ERROR "
+Could not find the tbb library!
+
+Please ensure that the tbb library is installed on your computer.
+If the library is not at a default location, either provide some hints
+via environment variables:
+TBB_LIBRARY_DIR TBB_INCLUDE_DIR
+Or set the relevant variables by hand in ccmake.
+
+Alternatively you may choose to compile the bundled contrib library of
+boost by setting DEAL_II_ALLOW_CONTRIB=on or
+DEAL_II_FORCE_CONTRIB_TBB=on.
+
+")
+ENDMACRO()
+
+
 CONFIGURE_FEATURE(TBB)
index 517921808aaf4d04ea4540eab386ad5aa66b9aa2..421c8f59bb578c3ae495ad1ed005731ff88110a6 100644 (file)
@@ -141,9 +141,6 @@ MACRO(CONFIGURE_FEATURE feature)
           MESSAGE(SEND_ERROR
             "Failed to set up DEAL_II_WITH_${feature} with contrib packages."
             )
-          RUN_COMMAND(
-            "CONFIGURE_FEATURE_${feature}_ERROR_MESSAGE()"
-            )
         ENDIF()
       ELSE()
         # TODO: Opt out!

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.