Skip to content

Commit e450c46

Browse files
authored
Merge pull request #540 from zeromq/static-libsodium [skip ci]
2 parents 3515b3f + 5b0aec2 commit e450c46

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
114114
- name: Install Dependencies and Build
115115
if: ${{ !matrix.docker }}
116-
run: pnpm install --verbose
116+
run: pnpm install
117117

118118
- name: Prebuild
119119
if: ${{ !matrix.docker }}

binding.gyp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
],
4747

4848
'include_dirs': [
49-
"vendor",
5049
'<(module_root_dir)/build/libzmq/include',
5150
"<!@(node -p \"require('node-addon-api').include\")"
5251
],
@@ -83,7 +82,7 @@
8382
['OS == "mac"', {
8483
'libraries': [
8584
'<(module_root_dir)/build/libzmq/lib/libzmq.a',
86-
'-lsodium',
85+
"<!@(pkg-config libsodium --libs)",
8786
],
8887
}],
8988

script/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function main() {
7878
writeFileSync(clang_format_file, "")
7979
}
8080

81-
const cmake_configure = `cmake -S "${src_dir}" -B ./build ${build_options} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${libzmq_install_prefix}" -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_STATIC=ON -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DWITH_DOCS=OFF`
81+
const cmake_configure = `cmake -S "${src_dir}" -B ./build ${build_options} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${libzmq_install_prefix}" -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_STATIC=ON -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DWITH_DOCS=OFF -DWITH_LIBSODIUM=ON -DWITH_LIBSODIUM_STATIC=ON`
8282
console.log(cmake_configure)
8383
exec(cmake_configure, execOptions)
8484

0 commit comments

Comments
 (0)