diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-02-28 16:14:30 +0000 |
| commit | 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 (patch) | |
| tree | 2a890e1df09e5b896a9b4168a7b22648f559a1f2 /cpp/src/rdma.cmake | |
| parent | 172d9b2a16cfb817bbe632d050acba7e31401cd2 (diff) | |
| download | qpid-python-asyncstore.tar.gz | |
Update from trunk r1375509 through r1450773asyncstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/rdma.cmake')
| -rw-r--r-- | cpp/src/rdma.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/rdma.cmake b/cpp/src/rdma.cmake index b0d92facab..1d355e7ae6 100644 --- a/cpp/src/rdma.cmake +++ b/cpp/src/rdma.cmake @@ -64,11 +64,12 @@ if (BUILD_RDMA) add_library (rdmawrap SHARED ${rdma_SOURCES}) target_link_libraries (rdmawrap qpidcommon rdmacm ibverbs) - set_target_properties (rdmawrap PROPERTIES VERSION ${rdmawrap_version}) + set_target_properties (rdmawrap PROPERTIES + LINK_FLAGS "${CATCH_UNDEFINED}" + VERSION ${rdmawrap_version}) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmawrap PROPERTIES - COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS ${GCC_CATCH_UNDEFINED}) + COMPILE_FLAGS -Wno-missing-field-initializers) endif (CMAKE_COMPILER_IS_GNUCXX) install (TARGETS rdmawrap @@ -78,12 +79,13 @@ if (BUILD_RDMA) add_library (rdma MODULE qpid/sys/RdmaIOPlugin.cpp) target_link_libraries (rdma qpidbroker rdmawrap) set_target_properties (rdma PROPERTIES + COMPILE_DEFINITIONS _IN_QPID_BROKER + LINK_FLAGS "${CATCH_UNDEFINED}" PREFIX "") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdma PROPERTIES - COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS ${GCC_CATCH_UNDEFINED}) + COMPILE_FLAGS -Wno-missing-field-initializers) endif (CMAKE_COMPILER_IS_GNUCXX) install (TARGETS rdma @@ -93,12 +95,12 @@ if (BUILD_RDMA) add_library (rdmaconnector MODULE qpid/client/RdmaConnector.cpp) target_link_libraries (rdmaconnector qpidclient rdmawrap) set_target_properties (rdmaconnector PROPERTIES + LINK_FLAGS "${CATCH_UNDEFINED}" PREFIX "") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(rdmaconnector PROPERTIES - COMPILE_FLAGS -Wno-missing-field-initializers - LINK_FLAGS ${GCC_CATCH_UNDEFINED}) + COMPILE_FLAGS -Wno-missing-field-initializers) endif (CMAKE_COMPILER_IS_GNUCXX) install (TARGETS rdmaconnector |