From a7a46928af65fba6e2df3649b37a9cd37db32b31 Mon Sep 17 00:00:00 2001
From: PengZheng <howtofly@gmail.com>
Date: Thu, 25 Apr 2024 17:49:13 +0800
Subject: [PATCH] Use latest macOS and latest OpenSSL.

---
 .github/workflows/macos.yml | 5 +++--
 cmake/Findcivetweb.cmake    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 08cb8da96..2857a2af4 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -75,7 +75,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Install dependencies
         run: |
-          brew install lcov jansson rapidjson libzip ccache ninja
+          brew install lcov jansson rapidjson libzip ccache ninja openssl
       - name: Prepare ccache timestamp
         id: ccache_cache_timestamp
         run: |
@@ -104,5 +104,6 @@ jobs:
       - name: Test
         run: |
           cd $GITHUB_WORKSPACE/build
-          export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
+          export DYLD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$DYLD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
           ctest --output-on-failure
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 00bc77e90..dc8aa91ec 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,7 +21,7 @@ if (NOT civetweb_FOUND)
     set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
     set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
     set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-atomic-implicit-seq-cst -Wno-error")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
     FetchContent_Declare(
             civetweb
             GIT_REPOSITORY https://github.com/civetweb/civetweb.git