From 5c03c18c3d416a41838d2608634f3cbfc4b8c2e5 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 19 Sep 2012 12:22:57 +0000 Subject: [PATCH] Some changes in the output git-svn-id: https://svn.dealii.org/branches/branch_cmake@26501 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/CMakeLists.txt | 12 ++++++------ deal.II/contrib/cmake/setup_finalize.cmake | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index a83f42a006..a88010bb71 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -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." diff --git a/deal.II/contrib/cmake/setup_finalize.cmake b/deal.II/contrib/cmake/setup_finalize.cmake index 4b6fb0eb0d..1f8c7588f1 100644 --- a/deal.II/contrib/cmake/setup_finalize.cmake +++ b/deal.II/contrib/cmake/setup_finalize.cmake @@ -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(" -- 2.39.5