diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-11-06 21:39:14 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-11-06 21:39:14 +0000 |
| commit | bc2f214dbd631358da84f4ebbe315555b9661f6b (patch) | |
| tree | 3082e65d54a04d192793d9faba1bc0a159704f6f /qpid/cpp/src/rdma.cmake | |
| parent | e0e0865dc59b0fa1a11d957736e15579de12a569 (diff) | |
| download | qpid-python-bc2f214dbd631358da84f4ebbe315555b9661f6b.tar.gz | |
NO-JIRA: Remove unnecessary gcc conditionals
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1406354 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/rdma.cmake')
| -rw-r--r-- | qpid/cpp/src/rdma.cmake | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qpid/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake index b0d92facab..21597f85d2 100644 --- a/qpid/cpp/src/rdma.cmake +++ b/qpid/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,12 @@ if (BUILD_RDMA) add_library (rdma MODULE qpid/sys/RdmaIOPlugin.cpp) target_link_libraries (rdma qpidbroker rdmawrap) set_target_properties (rdma PROPERTIES + 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 +94,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 |