Author: astitcher
Date: Mon May 11 18:18:40 2009
New Revision: 773636
URL: http://svn.apache.org/viewvc?rev=773636&view=rev
Log:
Cmake fixes:
Mirrored recent management code update.
Don't build failover_soak without cluster
Remove some unnecessary #includes from examples
Modified:
qpid/trunk/qpid/cpp/examples/CMakeLists.txt
qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp
qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp
qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Mon May 11 18:18:40 2009
@@ -25,6 +25,8 @@
# This will probably need some fiddling to get right for installed kits.
get_directory_property(QPIDC_TOP PARENT_DIRECTORY)
include_directories(${QPIDC_TOP}/src ${QPIDC_TOP}/src/gen)
+include_directories( ${Boost_INCLUDE_DIR} )
+link_directories( ${Boost_LIBRARY_DIRS} )
# There are numerous duplicate names within the examples. Since all target
# names must be unique, define a macro to prepend a prefix and manage the
Modified: qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/xml-exchange/declare_queues.cpp Mon May 11
18:18:40 2009
@@ -45,7 +45,6 @@
#include <qpid/client/Connection.h>
#include <qpid/client/Session.h>
-#include <unistd.h>
#include <cstdlib>
#include <iostream>
Modified: qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/xml-exchange/listener.cpp Mon May 11 18:18:40
2009
@@ -48,7 +48,6 @@
#include <qpid/client/Message.h>
#include <qpid/client/SubscriptionManager.h>
-#include <unistd.h>
#include <cstdlib>
#include <iostream>
Modified: qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/xml-exchange/xml_producer.cpp Mon May 11
18:18:40 2009
@@ -49,7 +49,6 @@
#include <qpid/client/Message.h>
-#include <unistd.h>
#include <cstdlib>
#include <iostream>
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon May 11 18:18:40 2009
@@ -86,7 +86,7 @@
endforeach (spec_file ${mgmt_specs})
if (regen_mgmt)
message(STATUS, "Regenerating Qpid Management Framework sources")
- execute_process(COMMAND ${PYTHON_EXECUTABLE} ${mgen_dir}/qmf-gen -c
${CMAKE_CURRENT_SOURCE_DIR}/managementgen.cmake -q -o gen/qmf ${mgmt_specs}
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} ${mgen_dir}/qmf-gen -c
${CMAKE_CURRENT_SOURCE_DIR}/managementgen.cmake -b -q -o gen/qmf ${mgmt_specs}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
else (regen_mgmt)
message(STATUS "No need to generate Qpid Management Framework sources")
@@ -540,7 +540,7 @@
qpid/broker/TxBuffer.cpp
qpid/broker/TxPublish.cpp
qpid/broker/Vhost.cpp
- qpid/management/ManagementBroker.cpp
+ qpid/management/ManagementAgent.cpp
qpid/management/ManagementExchange.cpp
qpid/sys/TCPIOPlugin.cpp
)
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h Mon May 11
18:18:40 2009
@@ -130,7 +130,7 @@
QPID_COMMON_EXTERN void writeTimestamps(qpid::framing::Buffer& buf);
public:
- static int maxThreads;
+ QPID_COMMON_EXTERN static int maxThreads;
typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&);
ManagementObject(Manageable* _core) :
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=773636&r1=773635&r2=773636&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Mon May 11 18:18:40 2009
@@ -179,10 +179,12 @@
#header_test_SOURCES=header_test.cpp TestOptions.h ConnectionOptions.h
add_dependencies (check header_test)
-add_executable (failover_soak failover_soak.cpp ForkedBroker.cpp)
-target_link_libraries (failover_soak qpidclient)
-#failover_soak_SOURCES=failover_soak.cpp ForkedBroker.h
-add_dependencies (check failover_soak)
+if (BUILD_CLUSTER)
+ add_executable (failover_soak failover_soak.cpp ForkedBroker.cpp)
+ target_link_libraries (failover_soak qpidclient)
+ #failover_soak_SOURCES=failover_soak.cpp ForkedBroker.h
+ add_dependencies (check failover_soak)
+endif (BUILD_CLUSTER)
add_executable (declare_queues declare_queues.cpp)
target_link_libraries (declare_queues qpidclient)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
