Skip to content

Commit

Permalink
Merge pull request #1 from forestsword/update-hunter
Browse files Browse the repository at this point in the history
Update hunter
  • Loading branch information
wildone authored Jun 29, 2021
2 parents 7cd3266 + 3ff6ce9 commit 4181fed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ include(HunterGate)
option(HUNTER_BUILD_SHARED_LIBS "Build Shared Library" ON)

HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.249.tar.gz"
SHA1 "d45d77d8bba9da13e9290a180e0477e90accd89b"
URL "https://github.com/cpp-pm/hunter/archive/v0.23.299.tar.gz"
SHA1 "3d215b4bfac80824778fe9a93510e5f651d79e3a"
LOCAL # load `${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/config.cmake`
)

Expand All @@ -26,7 +26,7 @@ option(JAEGERTRACING_WARNINGS_AS_ERRORS "Treat compiler warnings as errors" OFF)

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(cxx_flags -Wall -pedantic)
set(cxx_flags -Wall -pedantic -Wno-error=deprecated-copy)
if(JAEGERTRACING_WARNINGS_AS_ERRORS)
list(APPEND cxx_flags -Werror)
endif()
Expand Down Expand Up @@ -102,7 +102,7 @@ if(JAEGERTRACING_WITH_YAML_CPP)
# yaml-cpp-config.cmake file
find_package(yaml-cpp CONFIG REQUIRED)
if(HUNTER_ENABLED)
list(APPEND LIBS yaml-cpp::yaml-cpp)
list(APPEND LIBS yaml-cpp)
else()
list(APPEND LIBS yaml-cpp)
endif()
Expand Down Expand Up @@ -240,7 +240,7 @@ function(update_path_for_test atest)
# If dependent library is a DLL we have to add location of DLL to PATH
set(new_path "")

foreach(LIB OpenTracing::opentracing yaml-cpp::yaml-cpp GTest::main)
foreach(LIB OpenTracing::opentracing yaml-cpp GTest::main)
list(APPEND new_path $<TARGET_FILE_DIR:${LIB}>)
endforeach()
list(APPEND new_path $ENV{PATH})
Expand Down
1 change: 1 addition & 0 deletions cmake/Hunter/config.cmake
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
hunter_config(GTest VERSION 1.8.0-hunter-p11)
hunter_config(Boost VERSION 1.72.0-p1)

0 comments on commit 4181fed

Please sign in to comment.