From: Matthias Maier Date: Tue, 20 Aug 2013 05:56:42 +0000 (+0000) Subject: CMake: Fix a strange CMake bug X-Git-Tag: v8.1.0~570^2~461 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7d8bc89a554afd00efb6e9647604ba22f2da5e4;p=dealii.git CMake: Fix a strange CMake bug git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30349 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_boost.cmake b/deal.II/cmake/configure/configure_boost.cmake index f2071971ea..7b8ee48ed0 100644 --- a/deal.II/cmake/configure/configure_boost.cmake +++ b/deal.II/cmake/configure/configure_boost.cmake @@ -38,7 +38,11 @@ SET(DEAL_II_WITH_BOOST ON # Always true. We need it :-] MACRO(FEATURE_BOOST_FIND_EXTERNAL var) - SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}") + IF(NOT DEFINED BOOST_DIR) + SET(BOOST_DIR "$ENV{BOOST_DIR}") + ELSE() + SET_IF_EMPTY(BOOST_DIR "$ENV{BOOST_DIR}") + ENDIF() IF(NOT "${BOOST_DIR}" STREQUAL "") SET(BOOST_ROOT "${BOOST_DIR}") ENDIF()