diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt index aac2917cb5cc906a184240f4c146e9627001b4b3..fdced981ac18d44b9eb77894d0417e816138d40e 100644 --- a/Applications/Utils/FileConverter/CMakeLists.txt +++ b/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) diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt index b84f20bc1aa60bedbaf0fe0184a2eca40bdddd62..c64e2e4f39ab062e707f961ac82a7aa41741dc4b 100644 --- a/BaseLib/CMakeLists.txt +++ b/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 diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 382f10411b8de0413143a934c7cfe9e557c9c519..c24ab8dc8bd24fea60e7f775a285addbfa79b6cd 100644 --- a/scripts/cmake/Find.cmake +++ b/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)