Skip to content

Commit 97048ff

Browse files
committed
t
1 parent bee6f73 commit 97048ff

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/build-win-arm64-test.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ jobs:
4646
.\vcpkg\bootstrap-vcpkg.bat
4747
shell: cmd
4848

49+
- name: setup vcpkg
50+
run: |
51+
.\vcpkg\vcpkg install --triplet ${{ matrix.vcpkg_triplet }}
52+
shell: cmd
53+
4954
- name: Install npm dependencies
5055
run: |
5156
npm install --ignore-scripts
@@ -54,5 +59,6 @@ jobs:
5459
run: |
5560
node_modules/.bin/prebuild -r napi --upload -u ${{ secrets.GITHUB_TOKEN }} --backend cmake-js
5661
env:
57-
CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
58-
VCPKG_TARGET_TRIPLET: arm64-windows-static
62+
OPENSSL_ROOT_DIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkg_triplet }}
63+
OPENSSL_LIBRARIES: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkg_triplet }}/lib
64+
OPENSSL_INCLUDE_DIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkg_triplet }}/include

CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ include_directories(${CMAKE_JS_INC})
1111

1212
set(CMAKE_BUILD_TYPE Release)
1313

14-
set(VCPKG_TARGET_TRIPLET "arm64-windows-static" CACHE STRING "VCPKG target triplet")
15-
1614
if(WIN32)
1715
set(OPENSSL_MSVC_STATIC_RT TRUE)
1816
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

0 commit comments

Comments
 (0)