From: maier Date: Wed, 28 May 2014 15:10:52 +0000 (+0000) Subject: Bugfix: CMake, second try X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49bf39b4fe9210ad205e14fbec6654dcee123fdb;p=dealii-svn.git 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 b14b063f7c..33208996f5 100644 --- 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 28bcd0d1e7..7a6ce29f33 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -148,6 +148,13 @@ inconvenience this causes.

Specific improvements

    +
  1. 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... +
    + (Matthias Maier, 2014/05/28) +
  2. +
  3. Improved: CMake: Search results and error conditions for external libraries are now much more verbose. Added an MPI sanity check.