]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: fix find_boost call for windows
authorMatthias Maier <tamiko@43-1.org>
Tue, 4 Aug 2015 21:45:21 +0000 (21:45 +0000)
committerMatthias Maier <tamiko@43-1.org>
Wed, 5 Aug 2015 04:38:56 +0000 (23:38 -0500)
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.

cmake/modules/FindBOOST.cmake

index 238e1eb7a03717053cb9bf93e50ba80e03213ba5..827c5cb8cd97a2d5bd477ba775efe504219e0303 100644 (file)
@@ -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)

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.