Merge 1a0ad2dc90 into 6a68f1cc45

.github/workflows/cmake.yaml

@@ -19,28 +19,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest,
+        os: [ubuntu-latest, macos-latest, windows-latest]
-             macos-latest,
-             windows-latest]
 
     steps:
     - uses: actions/checkout@v3
     - name: Prepare dependencies
       run:   |
-        if [ "$RUNNER_OS" == "Linux" ]; then
+         if [ "$RUNNER_OS" == "Linux" ]; then
-             sudo apt-get update && \
+              sudo apt-get update && \
-             sudo apt-get install -yq \
+              sudo apt-get install -yq \
-               libasio-dev \
+                libboost-system-dev \
-               libssl-dev zlib1g-dev \
+                libboost-date-time-dev \
-               cmake graphviz doxygen
+                cmake \
-        elif [ "$RUNNER_OS" == "Windows" ]; then
+                graphviz doxygen
-             VCPKG_DEFAULT_TRIPLET=x64-windows vcpkg install
+         elif [ "$RUNNER_OS" == "Windows" ]; then
-        elif [ "$RUNNER_OS" == "macOS" ]; then
+              choco install boost-msvc-14.3 graphviz doxygen.install
-             brew install asio openssl zlib doxygen graphviz
+         elif [ "$RUNNER_OS" == "macOS" ]; then
-        else
+              brew install boost graphviz doxygen
-             echo "$RUNNER_OS not supported"
+         else
-             exit 1
+              echo "$RUNNER_OS not supported"
-        fi
+              exit 1
+         fi
       shell: bash      
     - name: Configure CMake
       run: cmake -B build

CMakeLists.txt

@@ -1,11 +1,8 @@
-cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15)
-
-project(oc-issuer VERSION 0.0.2 LANGUAGES CXX)
 
 enable_language(C)
 enable_language(CXX)
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_EXPORT_COMPILE_COMMANDS On)
 
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 if(POLICY CMP0077)
@@ -18,6 +15,7 @@ else()
     add_compile_options(-Wall -Wextra -pedantic)
 endif()
 
+project(oc-issuer VERSION 0.0.2 LANGUAGES CXX)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -30,7 +28,6 @@ set(CROW_BUILD_EXAMPLES Off)
 set(CROW_BUILD_TOOLS Off)
 set(CROW_BUILD_TESTS Off)
 set(CROW_BUILD_DOCS Off)
-set(CROW_FEATURES "ssl;compression")
 
 # add crow project to the build
 FetchContent_Declare(crow
@@ -72,7 +69,7 @@ set(CATCH_INSTALL_EXTRAS Off)
 FetchContent_Declare(
   Catch2
   GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.6.0
+  GIT_TAG        v3.3.1
 )
 
 FetchContent_MakeAvailable(Catch2)

vcpkg.json

@@ -1,9 +0,0 @@
-{
-    "name": "crow",
-    "version-string": "master",
-    "dependencies": [
-        "asio",
-        "openssl",
-        "zlib"
-    ]
-}