]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Fix a strange CMake bug
authorMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 20 Aug 2013 05:56:42 +0000 (05:56 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Tue, 20 Aug 2013 05:56:42 +0000 (05:56 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30349 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/configure/configure_boost.cmake

index f2071971ea5b63ced0ab9358ab0d29316ab952b3..7b8ee48ed0b79b0081f7e93a441bb80c38bdcedf 100644 (file)
@@ -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()

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.