cpp/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zeromq:master' into master

Browse Source
This commit is contained in:
Carbo Kuo 2024-08-06 16:08:23 -04:00 committed by GitHub
commit f9d3e32e3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -492,7 +492,7 @@ execute_process(
if(CACHELINE_SIZE STREQUAL ""
OR CACHELINE_SIZE EQUAL 0
OR CACHELINE_SIZE EQUAL -1
OR CACHELINE_SIZE EQUAL "undefined")
OR CACHELINE_SIZE STREQUAL "undefined")
set(ZMQ_CACHELINE_SIZE 64)
else()
set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})

5
Makefile.am
View File

@ -1418,6 +1418,11 @@ unittests_unittest_curve_encoding_LDADD = \
$(top_builddir)/src/.libs/libzmq.a \
${src_libzmq_la_LIBADD} \
$(CODE_COVERAGE_LDFLAGS)
if USE_LIBSODIUM
unittests_unittest_curve_encoding_CPPFLAGS += ${sodium_CFLAGS}
unittests_unittest_curve_encoding_LDADD += ${sodium_LIBS}
endif
endif
check_PROGRAMS = ${test_apps}