From 9f3b1f1e590b6d18e98b897f84cc16f64930ddd0 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 5 Nov 2012 10:37:33 +0000 Subject: [PATCH] Unify variable names git-svn-id: https://svn.dealii.org/branches/branch_cmake@27390 0785d39b-7218-0410-832d-ea1e28bc413d --- .../macros/macro_configure_feature.cmake | 8 ++--- deal.II/cmake/setup_cached_variables.cmake | 35 ++++++++++++------- deal.II/cmake/setup_finalize.cmake | 19 +++++----- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake index b45fb5bd0a..8e9e4a7de1 100644 --- a/deal.II/cmake/macros/macro_configure_feature.cmake +++ b/deal.II/cmake/macros/macro_configure_feature.cmake @@ -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() diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake index d1b567a43a..b59235e883 100644 --- a/deal.II/cmake/setup_cached_variables.cmake +++ b/deal.II/cmake/setup_cached_variables.cmake @@ -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() diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 567b108c13..acab8a28be 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -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}) -- 2.39.5