Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Hunter version and deps #808

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Bump Hunter version and deps #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e333b7
Bump Hunter version and deps
mvandeberg Jan 19, 2023
c726c0b
Actually bump Hunter and find packages
mvandeberg Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 16 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
41 changes: 41 additions & 0 deletions cmake/Hunter/config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down