File tree 3 files changed +13
-5
lines changed
3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 30
30
os :
31
31
- macos-14
32
32
otp :
33
- - 25
34
33
- 26
34
+ openssl :
35
+ - openssl3
36
+ - openssl
37
+ - sys
35
38
runs-on : ${{ matrix.os }}
36
39
steps :
37
40
- name : Checkout
51
54
brew install erlang@${{ matrix.otp }}
52
55
echo "$(brew --prefix erlang@${{ matrix.otp }})/bin" >> $GITHUB_PATH
53
56
- name : release build
57
+ env :
58
+ QUICER_TLS_VER : ${{ matrix.openssl }}
54
59
run : |
55
60
wget https://s3.amazonaws.com/rebar3/rebar3
56
61
sudo mv rebar3 /usr/local/bin/ && sudo chmod +x /usr/local/bin/rebar3
Original file line number Diff line number Diff line change 18
18
fail-fast : false
19
19
matrix :
20
20
otp :
21
- - 25
22
21
- 26
23
22
openssl :
24
23
- openssl3
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ if (DEFINED ENV{QUICER_TLS_VER})
46
46
endif ()
47
47
set (QUIC_USE_SYSTEM_LIBCRYPTO "ON" )
48
48
else ()
49
- set (QUIC_TLS $ENV{QUICER_TLS_VER} )
49
+ set (QUIC_TLS $ENV{QUICER_TLS_VER} CACHE STRING "QUIC_TLS" )
50
50
endif ()
51
51
52
52
endif ()
@@ -173,8 +173,12 @@ endif()
173
173
174
174
add_library (quicer_nif SHARED ${SOURCES} )
175
175
176
- # for macOS Workaround to use opensslquic head files.
177
- target_include_directories (quicer_nif PUBLIC "c_build/_deps/opensslquic-build/openssl/include" )
176
+ if (OPENSSL_INCLUDE_DIR)
177
+ # for sys crypto
178
+ target_include_directories (quicer_nif PUBLIC ${OPENSSL_INCLUDE_DIR} )
179
+ else ()
180
+ target_include_directories (quicer_nif PUBLIC "c_build/_deps/opensslquic-build/${QUIC_TLS} /include" )
181
+ endif ()
178
182
179
183
if (CMAKE_SYSTEM_NAME MATCHES Linux)
180
184
target_link_libraries (quicer_nif PRIVATE quicer_static "-Wl,--no-gc-sections -pthread" ) # no gc because of erlang nif symbols
You can’t perform that action at this time.
0 commit comments