Skip to content

Commit 0650fb0

Browse files
committed
fix: fix windows linker flags + use node 18 for MacOS 14
1 parent aa6748d commit 0650fb0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ jobs:
125125
run: pnpm run build.js
126126

127127
- name: Install Node 12
128-
if: ${{ !matrix.docker }}
128+
if: ${{ !matrix.docker && matrix.os != 'macos-14' }}
129129
uses: actions/setup-node@v4
130130
with:
131131
node-version: 12
132132
architecture: ${{ env.setup_node_arch }}
133133

134-
- name: Build Native with Node 12
134+
- name: Build Native
135135
if: ${{ !matrix.docker }}
136136
run: npm run build.native
137137

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ target_link_system_libraries(addon PRIVATE libzmq libzmq-static)
6060

6161
# Node specific
6262
target_include_system_directories(addon PRIVATE ${CMAKE_JS_INC})
63-
target_link_system_libraries(addon ${CMAKE_JS_LIB})
63+
target_link_system_libraries(addon PRIVATE ${CMAKE_JS_LIB})
6464

6565
target_compile_definitions(addon PRIVATE V8_COMPRESS_POINTERS)
6666
target_compile_definitions(addon PRIVATE V8_31BIT_SMIS_ON_64BIT_ARCH)
@@ -73,6 +73,6 @@ set_target_properties(addon PROPERTIES PREFIX "" SUFFIX ".node")
7373

7474
# Windows workaround
7575
if(WIN32)
76-
set_property(TARGET addon PROPERTY LINK_FLAGS "-Xlinker /DELAYLOAD:NODE.EXE")
76+
set_property(TARGET addon PROPERTY DELAY_LOAD_DLLS "NODE.EXE")
7777
target_link_libraries(addon PRIVATE "ShLwApi.lib" "delayimp.lib")
7878
endif()

0 commit comments

Comments
 (0)