aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorChristian Parpart <christian@ethereum.org>2019-01-14 19:21:06 +0800
committerChristian Parpart <christian@ethereum.org>2019-01-14 23:10:26 +0800
commitb7eaa4f8d3bfd4a1a04899f26bb1292ea1949f64 (patch)
tree75d83f5d604a4951d0436d6c8f776d811c00a21e /cmake
parent051df31924e7d10351e9a3abd4becd3631e83391 (diff)
downloaddexon-solidity-b7eaa4f8d3bfd4a1a04899f26bb1292ea1949f64.tar.gz
dexon-solidity-b7eaa4f8d3bfd4a1a04899f26bb1292ea1949f64.tar.zst
dexon-solidity-b7eaa4f8d3bfd4a1a04899f26bb1292ea1949f64.zip
Ensuring we use at least boost 1.65, build static on Xenial, and adapt CircleCI accordingly.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/EthDependencies.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index cc2f8711..477a604d 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -5,6 +5,9 @@ function(eth_show_dependency DEP NAME)
get_property(DISPLAYED GLOBAL PROPERTY ETH_${DEP}_DISPLAYED)
if (NOT DISPLAYED)
set_property(GLOBAL PROPERTY ETH_${DEP}_DISPLAYED TRUE)
+ if (NOT("${${DEP}_VERSION}" STREQUAL ""))
+ message(STATUS "${NAME} version: ${${DEP}_VERSION}")
+ endif()
message(STATUS "${NAME} headers: ${${DEP}_INCLUDE_DIRS}")
message(STATUS "${NAME} lib : ${${DEP}_LIBRARIES}")
if (NOT("${${DEP}_DLLS}" STREQUAL ""))
@@ -38,6 +41,6 @@ set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts)
set(Boost_USE_MULTITHREADED ON)
option(Boost_USE_STATIC_LIBS "Link Boost statically" ON)
-find_package(Boost 1.54.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system)
+find_package(Boost 1.65.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system)
eth_show_dependency(Boost boost)