Skip to content

Commit 805656f

Browse files
committed
Ensure lws uses installed openssl libs if build_deps is on
1 parent 8f7afb1 commit 805656f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: .github/build_windows_openssl.bat

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
22
mkdir build
33
cd build
4-
cmd.exe /c cmake -G "NMake Makefiles" ..
54
cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE -DENABLE_AWS_SDK_IN_TESTS=OFF -DEXT_PTHREAD_INCLUDE_DIR="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/include/" -DEXT_PTHREAD_LIBRARIES="C:/tools/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64/libpthreadGC2.a" ..
65
nmake

Diff for: .github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ jobs:
490490
# cd ..
491491
# ./scripts/check-sample.sh
492492
ubuntu-os-build:
493-
runs-on: ubuntu-latest
493+
runs-on: ubuntu-20.04
494494
env:
495495
AWS_KVS_LOG_LEVEL: 2
496496
permissions:
@@ -521,7 +521,7 @@ jobs:
521521
cd build
522522
timeout --signal=SIGABRT 60m ./tst/webrtc_client_test
523523
ubuntu-os-build-openssl-old:
524-
runs-on: ubuntu-20.04
524+
runs-on: ubuntu-latest
525525
env:
526526
AWS_KVS_LOG_LEVEL: 2
527527
permissions:

Diff for: CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,10 @@ if(BUILD_DEPENDENCIES)
177177
-DOPENSSL_DIR=${OPEN_SRC_INSTALL_PREFIX}
178178
-DUSE_OPENSSL=${USE_OPENSSL}
179179
-DUSE_MBEDTLS=${USE_MBEDTLS}
180+
-DLWS_OPENSSL_LIBRARIES=${OPEN_SRC_INSTALL_PREFIX}
180181
-DLWS_OPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
181182
-DLWS_OPENSSL_SSL_LIBRARY=${OPENSSL_SSL_LIBRARY}
182-
-DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSL_INCLUDE_DIR}
183+
-DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSL_INCLUDE_DIRS}
183184
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS})
184185
endif()
185186
build_dependency(websockets ${BUILD_ARGS})

0 commit comments

Comments
 (0)