From f44af10057b28a89a212de52b32c27f5ab388f1e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 13 Dec 2018 09:46:05 +0100
Subject: [PATCH] [CMake] Switched to bincrafters modular boost conan packages.
Bumped Boost to 1.66.0.
https://bincrafters.github.io/2017/09/22/boost-modular-packages-conan/
---
scripts/cmake/ConanSetup.cmake | 3 ++-
scripts/cmake/Find.cmake | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 608f6a29134..60b03bb5983 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -31,7 +31,8 @@ endif()
include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
- Boost/1.64.0@conan/stable
+ boost_optional/1.66.0@bincrafters/stable
+ boost_property_tree/1.66.0@bincrafters/stable
Eigen3/3.2.9@bilke/stable
VTK/8.1.1@bilke/stable
CACHE INTERNAL ""
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index b44bd0d2e51..9bff63e4d8f 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -60,8 +60,10 @@ find_program(MODULE_CMD modulecmd
######################
### Find libraries ###
######################
-find_package(Boost REQUIRED)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+if(NOT OGS_USE_CONAN)
+ find_package(Boost REQUIRED)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+endif()
find_package(VTK 8.1.0 REQUIRED)
include(${VTK_USE_FILE})
--
GitLab