qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r945642 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt Makefile.am tests/cluster.cmake
Date Tue, 18 May 2010 13:13:35 GMT
Author: gsim
Date: Tue May 18 13:13:34 2010
New Revision: 945642

URL: http://svn.apache.org/viewvc?rev=945642&view=rev
Log:
QPID-2612: remove qpidtypes lib as it causes problems on windows

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/tests/cluster.cmake

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=945642&r1=945641&r2=945642&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue May 18 13:13:34 2010
@@ -627,6 +627,10 @@ set (qpidcommon_SOURCES
      qpid/sys/Runnable.cpp
      qpid/sys/Shlib.cpp
      qpid/sys/Timer.cpp
+     qpid/types/Exception.cpp
+     qpid/types/Uuid.cpp
+     qpid/types/Variant.cpp
+     qpid/amqp_0_10/Codecs.cpp
 )
 
 add_library (qpidcommon SHARED ${qpidcommon_SOURCES})
@@ -634,7 +638,6 @@ if (CLOCK_GETTIME_IN_RT)
   set (qpidcommon_platform_LIBS ${qpidcommon_platform_LIBS} rt)
 endif (CLOCK_GETTIME_IN_RT)
 target_link_libraries (qpidcommon
-                       qpidtypes
                        ${qpidcommon_platform_LIBS}
                        ${qpidcommon_sasl_lib})
 set_target_properties (qpidcommon PROPERTIES
@@ -786,19 +789,6 @@ if (WIN32)
     endif (EXISTS ${DTC_PLUGIN_SOURCE})
 endif (WIN32)
 
-set (qpidtypes_SOURCES
-     qpid/types/Exception.cpp
-     qpid/types/Uuid.cpp
-     qpid/types/Variant.cpp
-     qpid/amqp_0_10/Codecs.cpp
-)
-add_library (qpidtypes SHARED ${qpidtypes_SOURCES})
-set_target_properties (qpidtypes PROPERTIES
-                       VERSION ${qpidc_version})
-install (TARGETS qpidtypes
-         DESTINATION ${QPID_INSTALL_LIBDIR}
-         COMPONENT ${QPID_COMPONENT_COMMON})
-
 set (qpidbroker_SOURCES
      ${mgen_broker_cpp}
      ${qpidbroker_platform_SOURCES}

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=945642&r1=945641&r2=945642&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue May 18 13:13:34 2010
@@ -186,7 +186,7 @@ libqpidcommon_la_SOURCES += $(poller) $(
 posix_broker_src = \
   qpid/broker/posix/BrokerDefaults.cpp
 
-lib_LTLIBRARIES = libqpidtypes.la libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la
+lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la
 
 # Definitions for client and daemon plugins
 PLUGINLDFLAGS=-no-undefined -module -avoid-version
@@ -312,7 +312,6 @@ EXTRA_DIST +=\
   qpid/store
 
 libqpidcommon_la_LIBADD = \
-  libqpidtypes.la \
   -lboost_program_options \
   -lboost_filesystem \
   -luuid \
@@ -479,7 +478,11 @@ libqpidcommon_la_SOURCES +=			\
   qpid/sys/Timer.h				\
   qpid/sys/Waitable.h				\
   qpid/sys/alloca.h				\
-  qpid/sys/uuid.h
+  qpid/sys/uuid.h			`	\
+  qpid/amqp_0_10/Codecs.cpp			\
+  qpid/types/Exception.cpp			\
+  qpid/types/Uuid.cpp				\
+  qpid/types/Variant.cpp
 
 if HAVE_SASL
 libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
@@ -487,12 +490,6 @@ libqpidcommon_la_SOURCES += qpid/sys/cyr
 libqpidcommon_la_LIBADD += -lsasl2
 endif
 
-libqpidtypes_la_SOURCES =			\
-  qpid/amqp_0_10/Codecs.cpp			\
-  qpid/types/Exception.cpp			\
-  qpid/types/Uuid.cpp				\
-  qpid/types/Variant.cpp
-
 libqpidbroker_la_LIBADD = libqpidcommon.la -luuid
 
 libqpidbroker_la_SOURCES = \

Modified: qpid/trunk/qpid/cpp/src/tests/cluster.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.cmake?rev=945642&r1=945641&r2=945642&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster.cmake Tue May 18 13:13:34 2010
@@ -21,10 +21,14 @@
 # Cluster tests cmake fragment, to be included in CMakeLists.txt
 # 
 
-add_executable (failover_soak failover_soak.cpp cluster_authentication_soak cluster_authentication_soak.cpp
ForkedBroker.cpp ${platform_test_additions})
-target_link_libraries (failover_soak cluster_authentication_soak qpidclient)
+add_executable (failover_soak failover_soak.cpp ForkedBroker.cpp ${platform_test_additions})
+target_link_libraries (failover_soak qpidclient)
 remember_location(failover_soak)
 
+add_executable (cluster_authentication_soak cluster_authentication_soak.cpp ForkedBroker.cpp
${platform_test_additions})
+target_link_libraries (cluster_authentication_soak qpidclient)
+remember_location(cluster_authentication_soak)
+
 set (cluster_test_SOURCES
   cluster_test
   unit_test



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message