Skip to content

Commit 76ef221

Browse files
authored
Merge pull request #330 from qzhuyan/dev/william/macOS-15
macOS 15 support
2 parents 1f933bc + e12dab2 commit 76ef221

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
matrix:
6262
os:
6363
- macos-14
64+
- macos-15
6465
otp:
6566
- 26
6667
openssl:
@@ -89,6 +90,7 @@ jobs:
8990
env:
9091
QUICER_TLS_VER: ${{ matrix.openssl }}
9192
run: |
93+
export QUICER_TLS_VER
9294
wget https://s3.amazonaws.com/rebar3/rebar3
9395
sudo mv rebar3 /usr/local/bin/ && sudo chmod +x /usr/local/bin/rebar3
9496
erl -eval 'erlang:display(erlang:system_info(system_version)),halt()'

CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,19 @@ set(SOURCES
143143
# @todo remove -DSO_ATTACH_REUSEPORT_CBPF=51
144144
add_compile_options(-DSO_ATTACH_REUSEPORT_CBPF=51)
145145

146+
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
147+
string(REPLACE "." ";" set_version_list ${CMAKE_CXX_COMPILER_VERSION})
148+
list(GET set_version_list 0 major_version)
149+
# Check for Clang version >= 16.0
150+
if (major_version GREATER_EQUAL 16)
151+
message(STATUS "Clang version >= 16.0 detected, enabling '-Wno-invalid-unevaluated-string'.")
152+
# Add the warning option
153+
add_compile_options(-Wno-invalid-unevaluated-string)
154+
else()
155+
message(STATUS "Clang version < 16.0, skipping '-Wno-invalid-unevaluated-string'.")
156+
endif()
157+
endif()
158+
146159
# for lttng, quicer_tp.h
147160
include_directories(c_src)
148161
# for templ files

0 commit comments

Comments
 (0)