From: Matthias Maier Date: Tue, 4 Aug 2015 21:45:21 +0000 (+0000) Subject: CMake: fix find_boost call for windows X-Git-Tag: v8.4.0-rc2~673^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=720ddd597ae01812b21c0ec990c7d687482bcd2b;p=dealii.git CMake: fix find_boost call for windows It turns out that the Windows version of CMake does not distinguish between FindBOOST.cmake and FindBoost.cmake - *yay*. Therefore, we also have to guard the invocation of FindBoost.cmake within deal.II's FindBOOST.cmake file. --- diff --git a/cmake/modules/FindBOOST.cmake b/cmake/modules/FindBOOST.cmake index 238e1eb7a0..827c5cb8cd 100644 --- a/cmake/modules/FindBOOST.cmake +++ b/cmake/modules/FindBOOST.cmake @@ -50,7 +50,9 @@ LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) # IF(NOT Boost_FOUND AND Boost_USE_STATIC_LIBS) SET(Boost_USE_STATIC_LIBS FALSE) + LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) FIND_PACKAGE(Boost 1.48 COMPONENTS iostreams serialization system thread) + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) ENDIF() IF(Boost_FOUND)