From ad3cb9016109855f37128c96a261f64f8be7f202 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 16 Aug 2013 22:38:21 +0000 Subject: [PATCH] CMake: Some final changes: - Get the behaviour for BOOST_DIR right - Print out *_DIR variables in detailed.log as well git-svn-id: https://svn.dealii.org/trunk@30325 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_boost.cmake | 5 +++++ deal.II/cmake/setup_finalize.cmake | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index afe23bab45..f2071971ea 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -82,7 +82,12 @@ MACRO(FEATURE_BOOST_FIND_EXTERNAL var) Boost_SYSTEM_FOUND AND (NOT DEAL_II_WITH_THREADS OR Boost_THREAD_FOUND) ) + MARK_AS_ADVANCED(BOOST_DIR) SET(${var} TRUE) + ELSE() + SET(BOOST_DIR "" CACHE PATH + "An optional hint to a boost directory" + ) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index bccc2b16b8..c90b9263ca 100644 --- a/deal.II/cmake/setup_finalize.cmake +++ b/deal.II/cmake/setup_finalize.cmake @@ -193,6 +193,13 @@ FOREACH(_var ${_features}) _detailed("# ${_feature}_VERSION = ${${_feature}_VERSION}\n") ENDIF() + # + # Print out ${_feature}_DIR: + # + IF(DEFINED ${_feature}_DIR) + _detailed("# ${_feature}_DIR = ${${_feature}_DIR}\n") + ENDIF() + # # Print the feature configuration: # -- 2.39.5