From: maier Date: Mon, 10 Sep 2012 14:51:02 +0000 (+0000) Subject: ... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be631ee90422d84e4758cc44b1d0995cbcfc2a7;p=dealii-svn.git ... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26268 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 0b4c414a2a..df4544d4e0 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -12,20 +12,12 @@ SET(CMAKE_INCLUDE_CURRENT_DIR true) # General configuration options: # -OPTION(DEAL_II_ALLOW_CONTRIB - "Allow the use of contrib libraries bundled with the source tarball. - Note: If set to off DEAL_II_FORCE_CONTRIB* will still pull in bundled - packages, so to ensure that only external libraries are used - DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be - OFF" - ON) - OPTION(DEAL_II_WITH_THREADS "Build deal.II with support for threads. This pulls in libtbb as a dependency." ON) OPTION(DEAL_II_FUNCTIONPARSER - "Build deal.II with support for functionparser" + "Build deal.II with support for functionparser." ON) OPTION(DEAL_II_MPI @@ -43,6 +35,14 @@ OPTION(DEAL_II_WITH_METIS # TODO: The rest ;-) +OPTION(DEAL_II_ALLOW_CONTRIB + "Allow the use of contrib libraries bundled with the source tarball. + Note: If set to off DEAL_II_FORCE_CONTRIB* will still pull in bundled + packages, so to ensure that only external libraries are used + DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be + OFF" + ON) + OPTION(DEAL_II_FORCE_CONTRIB_BOOST "Always use the bundled boost library instead of an external one." OFF)