]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Minor changes
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 11:08:11 +0000 (11:08 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 20 Sep 2012 11:08:11 +0000 (11:08 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26558 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/configure/configure_boost.cmake
deal.II/contrib/cmake/setup_cached_variables.cmake
deal.II/contrib/cmake/setup_compiler_flags_intel.cmake [moved from deal.II/contrib/cmake/setup_compiler_flags_icc.cmake with 100% similarity]

index 65f15308a97f3691011cdd491960c221d82c1d0a..daeee3780c4cad6939c648a23c98a99cfa0b31ff 100644 (file)
@@ -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
index ca45d7d74487946fdab0c842f81e8e4e6e213f13..a5f2ae7e9a9073169b45a6a4ac268e40d4a2bce2 100644 (file)
@@ -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.
index 628e579888b02f06041d17129d2c6f654c75df6a..c2162d66e1c869f88e4e829c099737882375e922 100644 (file)
@@ -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")
 
 
 #

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.