Bugfix: CMake, second try

git-svn-id: https://svn.dealii.org/trunk@32985 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/modules/FindBOOST.cmake b/deal.II/cmake/modules/FindBOOST.cmake
index b14b063f7ca6d1079ff848b23f6341fce8ca93a9..33208996f54bd299aa2afaf992bc31af902611f6 100644 (file)
--- a/deal.II/cmake/modules/FindBOOST.cmake
+++ b/deal.II/cmake/modules/FindBOOST.cmake
@@ -42,7 +42,9 @@ IF(NOT BUILD_SHARED_LIBS)
   SET(Boost_USE_STATIC_LIBS TRUE)
 ENDIF()
 
+LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 FIND_PACKAGE(Boost 1.44 COMPONENTS iostreams serialization system thread)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 
 #
 # Fall back to dynamic libraries if no static libraries could be found:

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 28bcd0d1e7582d84582f579384cfb86d408b0b00..7a6ce29f33c5e5029e4600122cc01d1869b28da1 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -148,6 +148,13 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> Bugfix: CMake: Also clean CMAKE_MODULE_PATH prior to call to
+  FIND_PACKAGE(Boost) inside FindBOOST.cmake because apparently
+  "Boost" == "BOOST" for the Mac file system...
+  <br>
+  (Matthias Maier, 2014/05/28)
+  </li>
+
   <li> Improved: CMake: Search results and error conditions for external
   libraries are now much more verbose. Added an MPI sanity check.
   <br>