Skip to content

Commit bb912e0

Browse files
committed
Update civetweb to 1.16 and replace LD_LIBRARY_PATH by DYLD_LIBRARY_PATH to fix macOS CI.
1 parent 0802579 commit bb912e0

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
uses: actions/[email protected]
7676
- name: Install dependencies
7777
run: |
78-
brew install lcov jansson rapidjson libzip ccache ninja
78+
brew install lcov jansson rapidjson libzip ccache ninja [email protected]
7979
- name: Prepare ccache timestamp
8080
id: ccache_cache_timestamp
8181
run: |
@@ -104,5 +104,5 @@ jobs:
104104
- name: Test
105105
run: |
106106
cd $GITHUB_WORKSPACE/build
107-
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
107+
export DYLD_LIBRARY_PATH=$(brew --prefix [email protected])/lib/:$DYLD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
108108
ctest --output-on-failure

cmake/Findcivetweb.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ if (NOT civetweb_FOUND)
2121
set(CIVETWEB_ENABLE_WEBSOCKETS TRUE CACHE BOOL "" FORCE)
2222
set(CIVETWEB_BUILD_TESTING FALSE CACHE BOOL "" FORCE)
2323
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
24+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
2425
FetchContent_Declare(
2526
civetweb
2627
GIT_REPOSITORY https://github.com/civetweb/civetweb.git
2728
# GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git
28-
GIT_TAG eefb26f82b233268fc98577d265352720d477ba4 # V1.15
29+
GIT_TAG d7ba35bbb649209c66e582d5a0244ba988a15159 # V1.16
2930
)
3031
FetchContent_MakeAvailable(civetweb)
3132
if (NOT TARGET civetweb::civetweb)

conanfile.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,6 @@ def requirements(self):
340340
self.requires("mdnsresponder/1310.140.1")
341341
# 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1' requires 'zlib/1.2.12'
342342
self.requires("zlib/1.2.13", override=True)
343-
# the latest civetweb (1.16) is not ready for openssl3
344-
self.requires("openssl/1.1.1t", override=True)
345343
self.validate()
346344

347345
def generate(self):

0 commit comments

Comments
 (0)