]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Unify variable names
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 5 Nov 2012 10:37:33 +0000 (10:37 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 5 Nov 2012 10:37:33 +0000 (10:37 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27390 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/macros/macro_configure_feature.cmake
deal.II/cmake/setup_cached_variables.cmake
deal.II/cmake/setup_finalize.cmake

index b45fb5bd0ad43348d4ea7ee50e0ffde8f0dc698b..8e9e4a7de1992a7ad50b809e6066482db10855c2 100644 (file)
@@ -145,12 +145,8 @@ MACRO(CONFIGURE_FEATURE _feature)
   #
   # Obey the user overrides:
   #
-  IF( FORCE_AUTODETECTION AND
-      (NOT "{_feature}" STREQUAL "BOOST") ) # TODO: Refactor this!
-    UNSET(DEAL_II_WITH_${_feature} CACHE)
-  ENDIF()
-  IF(DISABLE_AUTODETECTION AND
-    (NOT DEFINED DEAL_II_WITH_${_feature}) )
+  IF( (NOT DEAL_II_ALLOW_AUTODETECTION) AND
+      (NOT DEFINED DEAL_II_WITH_${_feature}) )
     SET_CACHED_OPTION(${_feature} OFF)
   ENDIF()
 
index d1b567a43a1250e4a4c3f6083afd64527c42431f..b59235e883593a25801f162471c8572dd537a739 100644 (file)
@@ -24,7 +24,8 @@
 #     DEAL_II_COMPONENT_CONTRIB
 #     DEAL_II_COMPONENT_DOCUMENTATION
 #     DEAL_II_COMPONENT_EXAMPLES
-#     CMAKE_INSTALL_PREFIX              **)
+#     DEAL_II_ALLOW_AUTODETECTION
+#     DEAL_II_FORCE_AUTODETECTION
 #
 # Options regarding compilation and linking:
 #
@@ -46,8 +47,6 @@
 #     (nonempty cached variable has precedence will not be overwritten by
 #     environment)
 #
-# **) for an in-source build (and if DISABLE_AUTOPILOT is not set)
-#
 
 
 ###########################################################################
@@ -85,16 +84,15 @@ OPTION(DEAL_II_COMPONENT_EXAMPLES
   ON
   )
 
-#
-# Set CMAKE_INSTALL_PREFIX to the source directory if an in source build is
-# detected (and DISABLE_AUTOPILOT is not set)
-#
-IF( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" AND
-    NOT DISABLE_AUTOPILOT)
-  SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}" CACHE STRING
-    "Install path prefix, prepended onto install directories."
-    )
-ENDIF()
+OPTION(DEAL_II_ALLOW_AUTODETECTION
+  "Allow to automatically setup features by setting all undefined DEAL_II_WITH_* variables to ON or OFF"
+  ON
+  )
+
+OPTION(DEAL_II_FORCE_AUTODETECTION
+  "Force feature autodetection by undefining all DEAL_II_WITH_* variables prior to configure"
+  OFF
+  )
 
 
 ###########################################################################
@@ -224,3 +222,14 @@ FOREACH(_flag ${DEAL_II_USED_FLAGS})
   MARK_AS_ADVANCED(${_flag})
 ENDFOREACH()
 
+IF(DEAL_II_FORCE_AUTODETECTION)
+  #
+  # Undefine all feature toggles DEAL_II_WITH_* prior to configure:
+  #
+  GET_CMAKE_PROPERTY(_res VARIABLES)
+  FOREACH(_var ${_res})
+    IF(_var MATCHES "DEAL_II_WITH_")
+      UNSET(${_var} CACHE)
+    ENDIF()
+  ENDFOREACH()
+ENDIF()
index 567b108c133aef0b772f0fd4c3cf097feb680aed..acab8a28bec97426bd727f11c48fa960edbfe727 100644 (file)
@@ -114,24 +114,21 @@ ELSEIF(NOT DEAL_II_KNOWN_COMPILER)
 ENDIF()
 
 FILE(APPEND ${_log}
-  "#\n#  Configured Features:"
+  "#\n#  Configured Features ("
   )
-IF(FORCE_AUTODETECTION)
+IF(DEFINED DEAL_II_ALLOW_BUNDLED)
   FILE(APPEND ${_log}
-    " !!! FORCE_AUTODETECTION !!!"
+    "DEAL_II_ALLOW_BUNDLED = ${DEAL_II_ALLOW_BUNDLED}, "
     )
 ENDIF()
-IF(DISABLE_AUTODETECTION)
+IF(DEAL_II_FORCE_AUTODETECTION)
   FILE(APPEND ${_log}
-    " !!! DISABLE_AUTODETECTION !!!"
+    "!!! DEAL_II_FORCE_AUTODETECTION=ON !!!, "
     )
 ENDIF()
-IF(DEFINED DEAL_II_ALLOW_BUNDLED)
-  FILE(APPEND ${_log}
-    " (DEAL_II_ALLOW_BUNDLED = ${DEAL_II_ALLOW_BUNDLED})"
-    )
-ENDIF()
-FILE(APPEND ${_log} "\n")
+FILE(APPEND ${_log}
+  "DEAL_II_ALLOW_AUTODETECTION = ${DEAL_II_ALLOW_AUTODETECTION}):\n"
+  )
 
 GET_CMAKE_PROPERTY(_res VARIABLES)
 FOREACH(_var ${_res})

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.