Skip to content

Commit

Permalink
Merge pull request #330 from qzhuyan/dev/william/macOS-15
Browse files Browse the repository at this point in the history
macOS 15 support
  • Loading branch information
qzhuyan authored Dec 18, 2024
2 parents 1f933bc + e12dab2 commit 76ef221
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
matrix:
os:
- macos-14
- macos-15
otp:
- 26
openssl:
Expand Down Expand Up @@ -89,6 +90,7 @@ jobs:
env:
QUICER_TLS_VER: ${{ matrix.openssl }}
run: |
export QUICER_TLS_VER
wget https://s3.amazonaws.com/rebar3/rebar3
sudo mv rebar3 /usr/local/bin/ && sudo chmod +x /usr/local/bin/rebar3
erl -eval 'erlang:display(erlang:system_info(system_version)),halt()'
Expand Down
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,19 @@ set(SOURCES
# @todo remove -DSO_ATTACH_REUSEPORT_CBPF=51
add_compile_options(-DSO_ATTACH_REUSEPORT_CBPF=51)

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
string(REPLACE "." ";" set_version_list ${CMAKE_CXX_COMPILER_VERSION})
list(GET set_version_list 0 major_version)
# Check for Clang version >= 16.0
if (major_version GREATER_EQUAL 16)
message(STATUS "Clang version >= 16.0 detected, enabling '-Wno-invalid-unevaluated-string'.")
# Add the warning option
add_compile_options(-Wno-invalid-unevaluated-string)
else()
message(STATUS "Clang version < 16.0, skipping '-Wno-invalid-unevaluated-string'.")
endif()
endif()

# for lttng, quicer_tp.h
include_directories(c_src)
# for templ files
Expand Down

0 comments on commit 76ef221

Please sign in to comment.