diff --git a/.travis.yml b/.travis.yml index a94ac52b..6d7b845a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,22 +15,22 @@ addons: jobs: include: - os: linux - dist: focal + dist: jammy env: - RUN_TYPE=coverage - MATRIX_EVAL="CC=clang-11 && CXX=clang++-11" - os: linux - dist: focal + dist: jammy env: - RUN_TYPE=test - MATRIX_EVAL="CC=gcc && CXX=g++" - os: linux - dist: focal + dist: jammy env: - RUN_TYPE=test - MATRIX_EVAL="CC=clang-11 && CXX=clang++-11" - os: linux - dist: focal + dist: jammy env: - BUILD_DOCKER=1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a8d1d66..751b2310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,8 @@ set( include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.23.313.tar.gz" - SHA1 "6c369e5aab2749a616917df3b23511535f413604" + URL "https://github.com/cpp-pm/hunter/archive/v0.24.14.tar.gz" + SHA1 "00901c19eefc02d24b16705b5f5a2b4f093a73fb" LOCAL ) @@ -44,6 +44,10 @@ add_compile_definitions(KOINOS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR}) add_compile_definitions(KOINOS_MINOR_VERSION=${PROJECT_VERSION_MINOR}) add_compile_definitions(KOINOS_PATCH_VERSION=${PROJECT_VERSION_PATCH}) +if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0") + cmake_policy(SET CMP0074 NEW) +endif () + option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF) # This is to force color output when using ccache with Unix Makefiles @@ -102,6 +106,11 @@ hunter_add_package(rocksdb) hunter_add_package(yaml-cpp) hunter_add_package(Protobuf) hunter_add_package(fizzy) +hunter_add_package(gRPC) +hunter_add_package(abseil) +hunter_add_package(re2) +hunter_add_package(c-ares) +hunter_add_package(ZLIB) hunter_add_package(koinos_log) hunter_add_package(koinos_util) @@ -121,6 +130,11 @@ find_package(RocksDB CONFIG REQUIRED) find_package(yaml-cpp CONFIG REQUIRED) find_package(Protobuf CONFIG REQUIRED) find_package(fizzy CONFIG REQUIRED) +find_package(gRPC CONFIG REQUIRED) +find_package(absl CONFIG REQUIRED) +find_package(re2 CONFIG REQUIRED) +find_package(c-ares CONFIG REQUIRED) +find_package(ZLIB CONFIG REQUIRED) find_package(koinos_crypto CONFIG REQUIRED) find_package(koinos_exception CONFIG REQUIRED) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index a8a8f681..ff968a7b 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -68,6 +68,47 @@ hunter_config(ethash CMAKE_CXX_STANDARD_REQUIRED=ON ) + +hunter_config(gRPC + VERSION 1.31.0-p0 + CMAKE_ARGS + CMAKE_POSITION_INDEPENDENT_CODE=ON + CMAKE_CXX_STANDARD=17 + CMAKE_CXX_STANDARD_REQUIRED=ON +) + +hunter_config(abseil + VERSION ${HUNTER_abseil_VERSION} + CMAKE_ARGS + CMAKE_POSITION_INDEPENDENT_CODE=ON + CMAKE_CXX_STANDARD=17 + CMAKE_CXX_STANDARD_REQUIRED=ON +) + +hunter_config(re2 + VERSION ${HUNTER_re2_VERSION} + CMAKE_ARGS + CMAKE_POSITION_INDEPENDENT_CODE=ON + CMAKE_CXX_STANDARD=17 + CMAKE_CXX_STANDARD_REQUIRED=ON +) + +hunter_config(c-ares + VERSION ${HUNTER_c-ares_VERSION} + CMAKE_ARGS + CMAKE_POSITION_INDEPENDENT_CODE=ON + CMAKE_CXX_STANDARD=17 + CMAKE_CXX_STANDARD_REQUIRED=ON +) + +hunter_config(ZLIB + VERSION ${HUNTER_ZLIB_VERSION} + CMAKE_ARGS + CMAKE_POSITION_INDEPENDENT_CODE=ON + CMAKE_CXX_STANDARD=17 + CMAKE_CXX_STANDARD_REQUIRED=ON +) + hunter_config(koinos_log GIT_SUBMODULE "libraries/log" CMAKE_ARGS