From e272cc362de60c2171eb2201161acadc023064c4 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 1 Mar 2019 10:01:16 +0100
Subject: [PATCH] [Conan] Switched back to monolithic Conan package.
Speeds up CMake run significantly and reduces Conan output a lot.
---
scripts/cmake/ConanSetup.cmake | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index ea57ad69c20..1009b328f6a 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -25,16 +25,14 @@ endif()
include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
- boost_dynamic_bitset/1.66.0@bincrafters/stable
- boost_optional/1.66.0@bincrafters/stable
- boost_property_tree/1.66.0@bincrafters/stable
+ boost/1.66.0@conan/stable
Eigen3/3.3.4@bilke/stable
VTK/8.1.1@bilke/stable
CACHE INTERNAL ""
)
set(CONAN_OPTIONS
- Boost:header_only=True
+ boost:header_only=True
Qt:qtxmlpatterns=True
VTK:minimal=True
VTK:ioxml=True
--
GitLab