Merge pull request #2610 from bilke/cmake-boost

Improve CMake find_package for Boost 

Applications/Utils/FileConverter/CMakeLists.txt

@@ -45,16 +45,11 @@ target_link_libraries(TecPlotTools GeoLib MeshLib)
 
 add_executable(GocadSGridReader GocadSGridReaderMain.cpp)
 set_target_properties(GocadSGridReader PROPERTIES FOLDER Utilities)
-target_link_libraries(GocadSGridReader
-                      GeoLib
-                      MeshLib
-                      ApplicationsFileIO
-                      ${Boost_LIBRARIES})
+target_link_libraries(GocadSGridReader GeoLib MeshLib ApplicationsFileIO)
 
 add_executable(GocadTSurfaceReader GocadTSurfaceReader.cpp)
 set_target_properties(GocadTSurfaceReader PROPERTIES FOLDER Utilities)
-target_link_libraries(GocadTSurfaceReader MeshLib ApplicationsFileIO
-                      ${Boost_LIBRARIES})
+target_link_libraries(GocadTSurfaceReader MeshLib ApplicationsFileIO)
 
 add_executable(Mesh2Raster MeshToRaster.cpp)
 set_target_properties(Mesh2Raster PROPERTIES FOLDER Utilities)

BaseLib/CMakeLists.txt

@@ -19,7 +19,7 @@ include(GenerateExportHeader)
 generate_export_header(BaseLib)
 target_include_directories(BaseLib PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
-target_link_libraries(BaseLib PUBLIC logog)
+target_link_libraries(BaseLib PUBLIC logog Boost::boost)
 
 if(MSVC)
     target_link_libraries(BaseLib PUBLIC WinMM) # needed for timeGetTime

scripts/cmake/Find.cmake

@@ -49,10 +49,7 @@ find_program(MODULE_CMD modulecmd
 ######################
 ### Find libraries ###
 ######################
-if(NOT OGS_USE_CONAN OR NOT CONAN_CMD)
-    find_package(Boost REQUIRED)
-    include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-endif()
+find_package(Boost 1.62.0 REQUIRED)
 
 set(VTK_COMPONENTS vtkIOXML)
 if(OGS_BUILD_GUI)
@@ -66,7 +63,7 @@ endif()
 if(OGS_USE_MPI)
     set(VTK_COMPONENTS ${VTK_COMPONENTS} vtkIOParallelXML vtkParallelMPI)
 endif()
-find_package(VTK 8.2.0 REQUIRED COMPONENTS ${VTK_COMPONENTS})
+find_package(VTK 8.1.2 REQUIRED COMPONENTS ${VTK_COMPONENTS})
 include(${VTK_USE_FILE})
 
 find_package(Eigen3 3.3.4 REQUIRED)