Cmake fixes:

  Mirrored recent management code update.
  Don't build failover_soak without cluster
  Remove some unnecessary #includes from examples



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@773636 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 11 insertions, 10 deletions

diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt
index c8c9910466..3c906bd750 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/cpp/examples/CMakeLists.txt
@@ -25,6 +25,8 @@ endif(COMMAND cmake_policy)
 # 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
diff --git a/cpp/examples/xml-exchange/declare_queues.cpp b/cpp/examples/xml-exchange/declare_queues.cpp
index d3a0f539b6..ad08642019 100644
--- a/cpp/examples/xml-exchange/declare_queues.cpp
+++ b/cpp/examples/xml-exchange/declare_queues.cpp
@@ -45,7 +45,6 @@
 #include <qpid/client/Connection.h>
 #include <qpid/client/Session.h>
 
-#include <unistd.h>
 #include <cstdlib>
 #include <iostream>
 
diff --git a/cpp/examples/xml-exchange/listener.cpp b/cpp/examples/xml-exchange/listener.cpp
index 02b722c745..11bcb9f669 100644
--- a/cpp/examples/xml-exchange/listener.cpp
+++ b/cpp/examples/xml-exchange/listener.cpp
@@ -48,7 +48,6 @@
 #include <qpid/client/Message.h>
 #include <qpid/client/SubscriptionManager.h>
 
-#include <unistd.h>
 #include <cstdlib>
 #include <iostream>
 
diff --git a/cpp/examples/xml-exchange/xml_producer.cpp b/cpp/examples/xml-exchange/xml_producer.cpp
index 5cb75d0087..af1a7e60c7 100644
--- a/cpp/examples/xml-exchange/xml_producer.cpp
+++ b/cpp/examples/xml-exchange/xml_producer.cpp
@@ -49,7 +49,6 @@
 #include <qpid/client/Message.h>
 
 
-#include <unistd.h>
 #include <cstdlib>
 #include <iostream>
 
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 3cde35c9fb..914984825c 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -86,7 +86,7 @@ if (EXISTS ${AMQP_SPEC})
   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 @@ set (libqpidbroker_SOURCES
      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
 )
diff --git a/cpp/src/qpid/management/ManagementObject.h b/cpp/src/qpid/management/ManagementObject.h
index 15c2307886..a6ef8fb392 100644
--- a/cpp/src/qpid/management/ManagementObject.h
+++ b/cpp/src/qpid/management/ManagementObject.h
@@ -130,7 +130,7 @@ protected:
     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) :
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt
index 4edbd0f2e5..98c4e2ee05 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/cpp/src/tests/CMakeLists.txt
@@ -179,10 +179,12 @@ target_link_libraries (header_test qpidclient)
 #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)