From 59545434d3714451a3336cddb32ae18ddb6b956d Mon Sep 17 00:00:00 2001 From: eyck Date: Mon, 10 Aug 2020 21:28:51 +0200 Subject: [PATCH] update to Boost 1.70 via conan --- .cproject | 745 ++++++++++++++++--------------------------------- CMakeLists.txt | 1 + conanfile.txt | 4 + dbt-core | 2 +- 4 files changed, 254 insertions(+), 498 deletions(-) diff --git a/.cproject b/.cproject index f7648da..9f757b2 100644 --- a/.cproject +++ b/.cproject @@ -1,502 +1,253 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e3ff85..849e7f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ setup_conan(TARGETS) # This line finds the boost lib and headers. set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. +set(BOOST_ROOT ${CONAN_BOOST_ROOT}) find_package(Threads) find_package(Tcmalloc) diff --git a/conanfile.txt b/conanfile.txt index 976a535..92ce149 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -7,12 +7,16 @@ SystemC-CCI/1.0.0@minres/stable #fbrdb/0.1.0@minres/testing tcc/0.9.27@minres/stable + boost/1.70.0@conan/stable [generators] cmake [options] Seasocks:shared=True + boost:fPIC=True + boost:shared=False + boost:header_only=False fmt:header_only=True SystemC:stdcxx=11 SystemC:shared=True diff --git a/dbt-core b/dbt-core index b0deae9..fcc04d4 160000 --- a/dbt-core +++ b/dbt-core @@ -1 +1 @@ -Subproject commit b0deae97e5ca0df86f79cb494d23d5c5003a4cd3 +Subproject commit fcc04d4d6914320285d05c7ff5c382f50aec7a82