Skip to content

Commit

Permalink
Use latest macOS and latest OpenSSL.
Browse files Browse the repository at this point in the history
  • Loading branch information
PengZheng committed Apr 25, 2024
1 parent a7361b6 commit a7a4692
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
uses: actions/[email protected]
- 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: |
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion cmake/Findcivetweb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a7a4692

Please sign in to comment.