Author: astitcher
Date: Tue Nov 17 06:42:13 2009
New Revision: 881170
URL: http://svn.apache.org/viewvc?rev=881170&view=rev
Log:
Make cluster/ssl/rdma/xml modules install correctly
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/cluster.cmake
qpid/trunk/qpid/cpp/src/rdma.cmake
qpid/trunk/qpid/cpp/src/ssl.cmake
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=881170&r1=881169&r2=881170&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue Nov 17 06:42:13 2009
@@ -317,7 +317,7 @@
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})
Modified: qpid/trunk/qpid/cpp/src/cluster.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.cmake?rev=881170&r1=881169&r2=881170&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/cluster.cmake Tue Nov 17 06:42:13 2009
@@ -122,10 +122,19 @@
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.
Modified: qpid/trunk/qpid/cpp/src/rdma.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/rdma.cmake?rev=881170&r1=881169&r2=881170&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/rdma.cmake (original)
+++ qpid/trunk/qpid/cpp/src/rdma.cmake Tue Nov 17 06:42:13 2009
@@ -71,6 +71,10 @@
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 @@
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 @@
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)
Modified: qpid/trunk/qpid/cpp/src/ssl.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ssl.cmake?rev=881170&r1=881169&r2=881170&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/ssl.cmake (original)
+++ qpid/trunk/qpid/cpp/src/ssl.cmake Tue Nov 17 06:42:13 2009
@@ -85,6 +85,10 @@
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 @@
LINK_FLAGS -Wl,--no-undefined)
endif (CMAKE_COMPILER_IS_GNUCXX)
+ install (TARGETS sslconnector
+ DESTINATION ${QPIDC_MODULE_DIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT})
+
endif (BUILD_SSL)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
