Skip to content

Commit f509729

Browse files
authored
Merge pull request #31 from 5cript/feat/boost_1_89_0
Updated find_package(boost).
2 parents 515d2a9 + f81b922 commit f509729

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
msystem: clang64
6666
release: true
67-
install: mingw-w64-clang-x86_64-clang make unzip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-boost mingw-w64-clang-x86_64-crypto++ libcurl mingw-w64-clang-x86_64-ninja
67+
install: mingw-w64-clang-x86_64-clang make unzip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-boost mingw-w64-clang-x86_64-crypto++ libcurl mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-nlohmann-json
6868

6969
- name: Workspace Path Fixup
7070
run: echo "WSPACE=$(cygpath '${{github.workspace}}')" >> $GITHUB_ENV

cmake/dependencies/boost.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if (CMAKE_VERSION VERSION_LESS "3.30")
2-
find_package(Boost 1.81.0 REQUIRED COMPONENTS system)
2+
find_package(Boost 1.81.0 REQUIRED OPTIONAL_COMPONENTS system)
33
else()
4-
find_package(Boost CONFIG 1.81.0 REQUIRED COMPONENTS system)
4+
find_package(Boost CONFIG 1.81.0 REQUIRED OPTIONAL_COMPONENTS system)
55
endif()

cmake/dependencies/gtest.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
option(ROAR_EXTERNAL_GTEST "Use an external gtest library (provide it manually)" OFF)
22
set(ROAR_GTEST_GIT_REPOSITORY "https://github.com/google/googletest.git" CACHE STRING "The URL from which to clone the gtest repository")
3-
set(ROAR_GTEST_GIT_TAG "release-1.11.0" CACHE STRING "The git tag or commit hash to checkout from the gtest repository")
3+
set(ROAR_GTEST_GIT_TAG "v1.17.0" CACHE STRING "The git tag or commit hash to checkout from the gtest repository")
44

55
if (${ROAR_EXTERNAL_GTEST})
66
else()
77
include(FetchContent)
88
FetchContent_Declare(
99
googletest
1010
GIT_REPOSITORY https://github.com/google/googletest.git
11-
GIT_TAG release-1.11.0
11+
GIT_TAG v1.17.0
1212
)
1313

1414
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

src/roar/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ target_include_directories(roar PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include
3939
${CURL_INCLUDE_DIR})
4040
target_link_libraries(
4141
roar
42-
PUBLIC Boost::system
42+
PUBLIC Boost::boost
4343
promise
4444
roar-cryptopp
4545
CURL::libcurl

0 commit comments

Comments
 (0)