]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some changes in the output
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 12:22:57 +0000 (12:22 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Sep 2012 12:22:57 +0000 (12:22 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26501 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/setup_finalize.cmake

index a83f42a006bf6e1cf39295a3a37501f6611cda78..a88010bb71e6593a1363bdf82705b41feb1de43b 100644 (file)
@@ -109,7 +109,7 @@ OPTION(DEAL_II_FEATURE_AUTODETECTION
   "Enables feature autodetection. This will automatically overwrite all
   DEAL_II_WITH_<...> toggles depending on whether they can be supported or
   not."
-  OFF)
+  ON)
 
 OPTION(DEAL_II_ALLOW_CONTRIB
   "Allow the use of contrib libraries bundled with the source tarball.
@@ -125,18 +125,18 @@ OPTION(DEAL_II_WITH_ARPACK
 
 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."
-  ON)
+  OFF)
 OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER
   "Always use the bundled functionparser library instead of an external one."
   ON)
 
 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."
@@ -156,7 +156,7 @@ OPTION(DEAL_II_WITH_P4EST
 
 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_FORCE_CONTRIB_TBB
   "Always use the bundled tbb library instead of an external one."
   ON)
@@ -170,7 +170,7 @@ OPTION(DEAL_II_WITH_UMFPACK
   OFF)
 OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK
   "Always use the bundled umfpack library instead of an external one."
-  OFF)
+  ON)
 
 OPTION(DEAL_II_WITH_ZLIB
   "Build deal.II with support for zlib."
index 4b6fb0eb0de2643313b40eb35692a52d478b446c..1f8c7588f1eef0ac1821124ea2605e859a8b9934 100644 (file)
@@ -55,11 +55,19 @@ IF(FEATURE_UMFPACK_CONTRIB_CONFIGURED)
   MESSAGE("The contrib UMFPACK library will be compiled with the following C compiler:
 
       CMAKE_C_COMPILER:       ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}
-      CMAKE_C_FLAGS:         ${CMAKE_C_FLAGS}
-      CMAKE_C_FLAGS_DEBUG:   ${CMAKE_C_FLAGS_DEBUG}
-      CMAKE_C_FLAGS_RELEASE: ${CMAKE_C_FLAGS_RELEASE}
+      CMAKE_C_FLAGS:         ${CMAKE_C_FLAGS}")
+  IF(CMAKE_BUILD_TYPE MATCHES "Release")
+    MESSAGE("      CMAKE_C_FLAGS_RELEASE: ${CMAKE_C_FLAGS_RELEASE}")
+  ENDIF()
+  IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+    MESSAGE("      CMAKE_C_FLAGS_DEBUG:   ${CMAKE_C_FLAGS_DEBUG}")
+  ENDIF()
+  MESSAGE("
+  ")
+ENDIF()
 
-")
+IF(NOT DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
+  MESSAGE("WARNING: DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS is set to OFF\n\n")
 ENDIF()
 
 MESSAGE("

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.