Skip to content

Commit 2c85ea0

Browse files
authored
Merge pull request #669 from zeromq/cmake-ts-fork
2 parents b28a42b + a179b76 commit 2c85ea0

File tree

6 files changed

+2535
-4261
lines changed

6 files changed

+2535
-4261
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ jobs:
125125
if: ${{ !matrix.docker }}
126126
run: pnpm run build.js
127127

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

135135
- name: Build Native
@@ -139,7 +139,7 @@ jobs:
139139
- name: Build Native Windows 32
140140
if: ${{ matrix.os == 'windows-2019' && matrix.node_arch == 'ia32' }}
141141
run:
142-
node ./node_modules/cmake-ts/build/main.js named-configs windows-x86
142+
node ./node_modules/@aminya/cmake-ts/build/main.js named-configs windows-x86
143143

144144
- name: Use Node 20
145145
if: ${{ !matrix.docker }}

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ project_options(ENABLE_CACHE ENABLE_COMPILE_COMMANDS_SYMLINK)
102102
file(GLOB_RECURSE SOURCES "./src/*.cc")
103103
add_library(addon SHARED ${SOURCES})
104104

105-
target_link_libraries(addon PRIVATE project_options project_warnings)
105+
target_link_libraries(addon PRIVATE project_options) # project_warnings
106106

107107
if(ZMQ_DRAFT)
108108
target_compile_definitions(addon PRIVATE ZMQ_BUILD_DRAFT_API)
@@ -135,6 +135,5 @@ set_target_properties(addon PROPERTIES PREFIX "" SUFFIX ".node")
135135

136136
# Windows
137137
if(WIN32)
138-
set_property(TARGET addon PROPERTY LINK_FLAGS "-Xlinker /DELAYLOAD:NODE.EXE")
139138
target_link_libraries(addon PRIVATE "ShLwApi.lib" "delayimp.lib")
140139
endif()

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ during build, you can build this package from source.
9797
Make sure you have the following installed before attempting to build from
9898
source:
9999

100-
- Node.js 12+ or Electron
100+
- Node.js 10+ or Electron
101101
- A working C++17 compiler toolchain with make
102-
- Python 3 with Node 12+ (or legacy Python 2.7)
102+
- Python 3 with Node 10+ (or legacy Python 2.7)
103103
- CMake 2.8+
104104
- curl
105105

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"homepage": "http://zeromq.github.io/zeromq.js/",
2121
"dependencies": {
22-
"cmake-ts": "^0.3.0",
22+
"@aminya/cmake-ts": "^0.3.0-aminya.7",
2323
"node-addon-api": "^8.2.1"
2424
},
2525
"devDependencies": {

0 commit comments

Comments
 (0)