diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-11-17 06:42:13 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-11-17 06:42:13 +0000 |
| commit | 19bf12cc3fe36396674a6b96f1546323e879153e (patch) | |
| tree | fa8f0cab1605c91be1a5e4382ce14f8544c61a96 | |
| parent | 00588ef1ccfc963ceae751b46659ad111c879c05 (diff) | |
| download | qpid-python-19bf12cc3fe36396674a6b96f1546323e879153e.tar.gz | |
Make cluster/ssl/rdma/xml modules install correctly
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@881170 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cpp/src/cluster.cmake | 11 | ||||
| -rw-r--r-- | cpp/src/rdma.cmake | 12 | ||||
| -rw-r--r-- | cpp/src/ssl.cmake | 8 |
4 files changed, 31 insertions, 2 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index be8bd51d2c..e0d47b893b 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -317,7 +317,7 @@ if (BUILD_XML) PREFIX "" LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) - install (TARGETS xml RUNTIME + install (TARGETS xml DESTINATION ${QPIDD_MODULE_DIR} COMPONENT ${QPID_COMPONENT_BROKER}) diff --git a/cpp/src/cluster.cmake b/cpp/src/cluster.cmake index 31d8b07208..1f4815fc9d 100644 --- a/cpp/src/cluster.cmake +++ b/cpp/src/cluster.cmake @@ -122,10 +122,19 @@ if (BUILD_CLUSTER) add_library (cluster MODULE ${cluster_SOURCES}) target_link_libraries (cluster ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient) -#cluster_la_LDFLAGS = $(PLUGINLDFLAGS) + set_target_properties (cluster PROPERTIES PREFIX "") + if (CMAKE_COMPILER_IS_GNUCXX) + set_target_properties(cluster PROPERTIES + LINK_FLAGS -Wl,--no-undefined) + endif (CMAKE_COMPILER_IS_GNUCXX) + + install (TARGETS cluster + DESTINATION ${QPIDD_MODULE_DIR} + COMPONENT ${QPID_COMPONENT_BROKER}) + endif (BUILD_CLUSTER) # Distribute all sources. diff --git a/cpp/src/rdma.cmake b/cpp/src/rdma.cmake index ab8ed6303c..e020cb84a9 100644 --- a/cpp/src/rdma.cmake +++ b/cpp/src/rdma.cmake @@ -71,6 +71,10 @@ if (BUILD_RDMA) LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + install (TARGETS rdmawrap + DESTINATION ${QPID_INSTALL_LIBDIR} + COMPONENT ${QPID_COMPONENT_COMMON}) + add_library (rdma MODULE qpid/sys/RdmaIOPlugin.cpp) target_link_libraries (rdma qpidbroker rdmawrap) set_target_properties (rdma PROPERTIES @@ -82,6 +86,10 @@ if (BUILD_RDMA) LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + install (TARGETS rdma + DESTINATION ${QPIDD_MODULE_DIR} + COMPONENT ${QPID_COMPONENT_BROKER}) + add_library (rdmaconnector MODULE qpid/client/RdmaConnector.cpp) target_link_libraries (rdmaconnector qpidclient rdmawrap) set_target_properties (rdmaconnector PROPERTIES @@ -93,6 +101,10 @@ if (BUILD_RDMA) LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + install (TARGETS rdmaconnector + DESTINATION ${QPIDC_MODULE_DIR} + COMPONENT ${QPID_COMPONENT_CLIENT}) + # RDMA test/sample programs add_executable (RdmaServer qpid/sys/rdma/RdmaServer.cpp) target_link_libraries (RdmaServer rdmawrap qpidcommon) diff --git a/cpp/src/ssl.cmake b/cpp/src/ssl.cmake index 278373cb2a..13fafa587f 100644 --- a/cpp/src/ssl.cmake +++ b/cpp/src/ssl.cmake @@ -85,6 +85,10 @@ if (BUILD_SSL) LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + install (TARGETS ssl + DESTINATION ${QPIDD_MODULE_DIR} + COMPONENT ${QPID_COMPONENT_BROKER}) + add_library (sslconnector MODULE qpid/client/SslConnector.cpp) target_link_libraries (sslconnector qpidclient sslcommon) set_target_properties (sslconnector PROPERTIES @@ -95,4 +99,8 @@ if (BUILD_SSL) LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + install (TARGETS sslconnector + DESTINATION ${QPIDC_MODULE_DIR} + COMPONENT ${QPID_COMPONENT_CLIENT}) + endif (BUILD_SSL) |