Skip to content

Commit

Permalink
Merge pull request #669 from zeromq/cmake-ts-fork
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya authored Oct 23, 2024
2 parents b28a42b + a179b76 commit 2c85ea0
Show file tree
Hide file tree
Showing 6 changed files with 2,535 additions and 4,261 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ jobs:
if: ${{ !matrix.docker }}
run: pnpm run build.js

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

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

- name: Use Node 20
if: ${{ !matrix.docker }}
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ project_options(ENABLE_CACHE ENABLE_COMPILE_COMMANDS_SYMLINK)
file(GLOB_RECURSE SOURCES "./src/*.cc")
add_library(addon SHARED ${SOURCES})

target_link_libraries(addon PRIVATE project_options project_warnings)
target_link_libraries(addon PRIVATE project_options) # project_warnings

if(ZMQ_DRAFT)
target_compile_definitions(addon PRIVATE ZMQ_BUILD_DRAFT_API)
Expand Down Expand Up @@ -135,6 +135,5 @@ set_target_properties(addon PROPERTIES PREFIX "" SUFFIX ".node")

# Windows
if(WIN32)
set_property(TARGET addon PROPERTY LINK_FLAGS "-Xlinker /DELAYLOAD:NODE.EXE")
target_link_libraries(addon PRIVATE "ShLwApi.lib" "delayimp.lib")
endif()
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ during build, you can build this package from source.
Make sure you have the following installed before attempting to build from
source:

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

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"homepage": "http://zeromq.github.io/zeromq.js/",
"dependencies": {
"cmake-ts": "^0.3.0",
"@aminya/cmake-ts": "^0.3.0-aminya.7",
"node-addon-api": "^8.2.1"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 2c85ea0

Please sign in to comment.