Skip to content

Commit b212a04

Browse files
committed
updated github flow with asio for newer crowcpp
1 parent 6a68f1c commit b212a04

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

.github/workflows/cmake.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,29 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [ubuntu-latest, macos-latest, windows-latest]
22+
os: [ubuntu-latest,
23+
macos-latest,
24+
windows-latest]
2325

2426
steps:
2527
- uses: actions/checkout@v3
2628
- name: Prepare dependencies
2729
run: |
28-
if [ "$RUNNER_OS" == "Linux" ]; then
29-
sudo apt-get update && \
30-
sudo apt-get install -yq \
31-
libboost-system-dev \
32-
libboost-date-time-dev \
33-
cmake \
34-
graphviz doxygen
35-
elif [ "$RUNNER_OS" == "Windows" ]; then
36-
choco install boost-msvc-14.3 graphviz doxygen.install
37-
elif [ "$RUNNER_OS" == "macOS" ]; then
38-
brew install boost graphviz doxygen
39-
else
40-
echo "$RUNNER_OS not supported"
41-
exit 1
42-
fi
43-
shell: bash
30+
if [ "$RUNNER_OS" == "Linux" ]; then
31+
sudo apt-get update && \
32+
sudo apt-get install -yq \
33+
libasio-dev \
34+
libssl-dev zlib1g-dev \
35+
cmake graphviz doxygen
36+
elif [ "$RUNNER_OS" == "Windows" ]; then
37+
VCPKG_DEFAULT_TRIPLET=x64-windows vcpkg install
38+
elif [ "$RUNNER_OS" == "macOS" ]; then
39+
brew install asio openssl zlib
40+
else
41+
echo "$RUNNER_OS not supported"
42+
exit 1
43+
fi
44+
shell: bash
4445
- name: Configure CMake
4546
run: cmake -B build
4647
shell: bash

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
cmake_minimum_required(VERSION 3.1.3)
1+
cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
2+
3+
project(oc-issuer VERSION 0.0.2 LANGUAGES CXX)
24

35
enable_language(C)
46
enable_language(CXX)
57
set(CMAKE_CXX_STANDARD 17)
8+
set(CMAKE_EXPORT_COMPILE_COMMANDS On)
69

710
if(POLICY CMP0077)
811
cmake_policy(SET CMP0077 NEW)
@@ -14,7 +17,6 @@ else()
1417
add_compile_options(-Wall -Wextra -pedantic)
1518
endif()
1619

17-
project(oc-issuer VERSION 0.0.2 LANGUAGES CXX)
1820

1921
include(FetchContent)
2022

@@ -25,11 +27,12 @@ set(CROW_BUILD_EXAMPLES Off)
2527
set(CROW_BUILD_TOOLS Off)
2628
set(CROW_BUILD_TESTS Off)
2729
set(CROW_BUILD_DOCS Off)
30+
set(CROW_FEATURES "ssl;compression")
2831

2932
# add crow project to the build
3033
FetchContent_Declare(crow
3134
GIT_REPOSITORY https://github.com/CrowCpp/Crow.git
32-
GIT_TAG v1.0+5
35+
GIT_TAG v1.2.0
3336
)
3437

3538
if(NOT crow_POPULATED)
@@ -54,7 +57,7 @@ set(CATCH_INSTALL_EXTRAS Off)
5457
FetchContent_Declare(
5558
Catch2
5659
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
57-
GIT_TAG v3.3.1
60+
GIT_TAG v3.6.0
5861
)
5962

6063
FetchContent_MakeAvailable(Catch2)

0 commit comments

Comments
 (0)