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

CMake: properly set ZMQ_HAVE_OPENPGM and ZMQ_HAVE_VMCI
This commit is contained in:
Luca Boccassi 2023-03-05 17:49:02 +00:00 committed by GitHub
commit 3f5d915b56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -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()

View File

@ -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