Merge pull request #4523 from stephanlachnit/p-fix-cmake-pgm-vmci

CMake: properly set ZMQ_HAVE_OPENPGM and ZMQ_HAVE_VMCI
zeromq · Mar 5, 2023 · 3f5d915 · 3f5d915
2 parents e613093 + 8706506
commit 3f5d915
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1186,7 +1186,8 @@ set(readme-docs AUTHORS COPYING COPYING.LESSER NEWS)
 # optional modules
 
 if(WITH_OPENPGM)
-  add_definitions(-DZMQ_HAVE_OPENPGM)
+  message(STATUS "Building with OpenPGM")
+  set(ZMQ_HAVE_OPENPGM 1)
   include_directories(${OPENPGM_INCLUDE_DIRS})
   link_directories(${OPENPGM_LIBRARY_DIRS})
   set(OPTIONAL_LIBRARIES ${OPENPGM_LIBRARIES})
@@ -1203,7 +1204,8 @@ if(WITH_NORM)
 endif()
 
 if(WITH_VMCI)
-  add_definitions(-DZMQ_HAVE_VMCI)
+message(STATUS "Building with VMCI")
+  set(ZMQ_HAVE_VMCI 1)
   include_directories(${VMCI_INCLUDE_DIRS})
   list(APPEND cxx-sources vmci_address.cpp vmci_connecter.cpp vmci_listener.cpp vmci.cpp)
 endif()

diff --git a/builds/cmake/platform.hpp.in b/builds/cmake/platform.hpp.in
@@ -70,6 +70,8 @@
 
 #cmakedefine ZMQ_HAVE_OPENPGM
 #cmakedefine ZMQ_HAVE_NORM
+#cmakedefine ZMQ_HAVE_VMCI
+
 #cmakedefine ZMQ_MAKE_VALGRIND_HAPPY
 
 #cmakedefine ZMQ_HAVE_CURVE