Merge pull request #3758 from sonoware/fix-set-cpu-affinity

Fix set cpu affinity
zeromq · Dec 13, 2019 · 3e7995f · 3e7995f
2 parents eb54966 + 8089529
commit 3e7995f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/RELICENSE/sonoware.md b/RELICENSE/sonoware.md
@@ -0,0 +1,13 @@
+# Permission to Relicense under MPLv2
+
+This is a statement by sonoware GmbH that grants permission to relicense its
+copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
+v2 (MPLv2).
+
+A portion of the commits made by the Github handle "sonoware", with commit author
+"Stephan Senkbeil" are copyright of sonoware GmbH. 
+This document hereby grants the libzmq project team to relicense libzmq, including
+all past, present and future contributions of the authors listed above.
+
+Stephan Senkbeil <stephan.senkbeil@sonoware.de>
+2019/12/13
diff --git a/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/builds/cmake/Modules/ZMQSourceRunChecks.cmake
@@ -273,7 +273,7 @@ int main(int argc, char *argv [])
     return 0;
 }
 "
-    ZMQ_HAVE_PTHREAD_SETAFFINITY)
+    ZMQ_HAVE_PTHREAD_SET_AFFINITY)
   set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
 endmacro()
 

diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in
@@ -48,6 +48,7 @@
 #cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_2
 #cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_3
 #cmakedefine ZMQ_HAVE_PTHREAD_SET_NAME
+#cmakedefine ZMQ_HAVE_PTHREAD_SET_AFFINITY
 #cmakedefine HAVE_ACCEPT4
 #cmakedefine HAVE_STRNLEN