From: maier Date: Thu, 20 Sep 2012 11:08:11 +0000 (+0000) Subject: Minor changes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80572f85e4fd3af90412a8f94d5b7b97da4a2ef4;p=dealii-svn.git Minor changes git-svn-id: https://svn.dealii.org/branches/branch_cmake@26558 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 65f15308a9..daeee3780c 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -142,6 +142,13 @@ OPTION(DEAL_II_WITH_BLAS "Build deal.II with support for BLAS." OFF) +SET(DEAL_II_WITH_BOOST "ON" + CACHE BOOL "Build deal.II with support for boost." FORCE + ) # Always true. We need it :-] +OPTION(DEAL_II_FORCE_CONTRIB_BOOST + "Always use the bundled boost library instead of an external one." + ON) + OPTION(DEAL_II_WITH_DOXYGEN "Enable the generation and installation of the documentation via doxygen. This feature adds a COMPONENT \"documentation\" to the build system." @@ -196,10 +203,6 @@ OPTION(DEAL_II_WITH_ZLIB "Build deal.II with support for zlib." OFF) -OPTION(DEAL_II_FORCE_CONTRIB_BOOST - "Always use the bundled boost library instead of an external one." - OFF) - # # Build configuration: configuration options regarding compilation and # installation of the deal.II library diff --git a/deal.II/contrib/cmake/configure/configure_boost.cmake b/deal.II/contrib/cmake/configure/configure_boost.cmake index ca45d7d744..a5f2ae7e9a 100644 --- a/deal.II/contrib/cmake/configure/configure_boost.cmake +++ b/deal.II/contrib/cmake/configure/configure_boost.cmake @@ -2,13 +2,6 @@ # Configuration for the boost library: # -# -# Always true. We need it :-] -# -SET(DEAL_II_WITH_BOOST "ON" - CACHE STRING "Build deal.II with support for boost." FORCE - ) - # # This configure script has to be included after configure_tbb. diff --git a/deal.II/contrib/cmake/setup_cached_variables.cmake b/deal.II/contrib/cmake/setup_cached_variables.cmake index 628e579888..c2162d66e1 100644 --- a/deal.II/contrib/cmake/setup_cached_variables.cmake +++ b/deal.II/contrib/cmake/setup_cached_variables.cmake @@ -56,7 +56,7 @@ ENDIF() # # Set BUILD_SHARED_LIBS to default to ON: # -SET(BUILD_SHARED_LIBS ON CACHE OPTION "Build a shared library") +SET(BUILD_SHARED_LIBS "ON" CACHE BOOL "Build a shared library") # diff --git a/deal.II/contrib/cmake/setup_compiler_flags_icc.cmake b/deal.II/contrib/cmake/setup_compiler_flags_intel.cmake similarity index 100% rename from deal.II/contrib/cmake/setup_compiler_flags_icc.cmake rename to deal.II/contrib/cmake/setup_compiler_flags_intel.cmake