From 4538d1106d7e245387f5e46cad8ccb1e6befccaa Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 15 Aug 2019 10:38:07 +0200
Subject: [PATCH] [cmake] Fix find_package for boost.
---
Applications/Utils/FileConverter/CMakeLists.txt | 9 ++-------
scripts/cmake/Find.cmake | 5 +----
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Applications/Utils/FileConverter/CMakeLists.txt b/Applications/Utils/FileConverter/CMakeLists.txt
index aac2917cb5c..fdced981ac1 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/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 382f10411b8..2b5687c6173 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)
--
GitLab