Merge pull request #745 from apache/hotfix/openssl-update
Hotfix/macos-build-brew-fix
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 08cb8da..54872e5 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -75,7 +75,7 @@
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@1.1
- name: Prepare ccache timestamp
id: ccache_cache_timestamp
run: |
@@ -104,5 +104,5 @@
- 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=$(brew --prefix openssl@1.1)/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
ctest --output-on-failure
diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake
index 46310ed..dc8aa91 100644
--- a/cmake/Findcivetweb.cmake
+++ b/cmake/Findcivetweb.cmake
@@ -21,11 +21,12 @@
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-error")
FetchContent_Declare(
civetweb
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
# GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git
- GIT_TAG eefb26f82b233268fc98577d265352720d477ba4 # V1.15
+ GIT_TAG d7ba35bbb649209c66e582d5a0244ba988a15159 # V1.16
)
FetchContent_MakeAvailable(civetweb)
if (NOT TARGET civetweb::civetweb)
diff --git a/conanfile.py b/conanfile.py
index 609082c..dbb748a 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -340,8 +340,6 @@
self.requires("mdnsresponder/1310.140.1")
# 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1' requires 'zlib/1.2.12'
self.requires("zlib/1.2.13", override=True)
- # the latest civetweb (1.16) is not ready for openssl3
- self.requires("openssl/1.1.1t", override=True)
self.validate()
def generate(self):
