diff options
Diffstat (limited to 'cpp/src/CMakeLists.txt')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 82 |
1 files changed, 58 insertions, 24 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 1f3c2a739d..526f191f84 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -220,7 +220,7 @@ execute_process(COMMAND ${RUBY_EXECUTABLE} -I ${rgen_dir} ${rgen_dir}/generate $ 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 managementgen.cmake -b -q -o ${CMAKE_CURRENT_BINARY_DIR}/qmf ${mgmt_specs} +execute_process(COMMAND ${PYTHON_EXECUTABLE} ${mgen_dir}/qmf-gen -c managementgen.cmake -b -l -q -o ${CMAKE_CURRENT_BINARY_DIR}/qmf ${mgmt_specs} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) else (regen_mgmt) message(STATUS "No need to generate Qpid Management Framework sources") @@ -281,7 +281,7 @@ endif (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) set (COMPILER_FLAGS "-library=stlport4 -mt") - set (WARNING_FLAGS "+w2") + set (WARNING_FLAGS "+w") endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON) @@ -626,27 +626,42 @@ set (ha_default ON) option(BUILD_HA "Build Active-Passive HA plugin" ${ha_default}) if (BUILD_HA) set (ha_SOURCES + qpid/ha/AlternateExchangeSetter.h + qpid/ha/BackupConnectionExcluder.h + qpid/ha/BrokerInfo.cpp + qpid/ha/BrokerInfo.h + qpid/ha/QueueGuard.cpp + qpid/ha/QueueGuard.h + qpid/ha/ReplicationTest.cpp + qpid/ha/ReplicationTest.h qpid/ha/Backup.cpp qpid/ha/Backup.h + qpid/ha/BrokerReplicator.cpp + qpid/ha/BrokerReplicator.h + qpid/ha/ConnectionObserver.cpp + qpid/ha/ConnectionObserver.h qpid/ha/HaBroker.cpp qpid/ha/HaBroker.h qpid/ha/HaPlugin.cpp - qpid/ha/Settings.h - qpid/ha/QueueReplicator.h + qpid/ha/Membership.cpp + qpid/ha/Membership.h + qpid/ha/Primary.cpp + qpid/ha/Primary.h + qpid/ha/QueueRange.h qpid/ha/QueueReplicator.cpp - qpid/ha/ReplicateLevel.h - qpid/ha/ReplicateLevel.cpp - qpid/ha/ReplicatingSubscription.h + qpid/ha/QueueReplicator.h qpid/ha/ReplicatingSubscription.cpp - qpid/ha/BrokerReplicator.cpp - qpid/ha/BrokerReplicator.h - qpid/ha/ConnectionExcluder.cpp - qpid/ha/ConnectionExcluder.h + qpid/ha/ReplicatingSubscription.h + qpid/ha/Settings.h + qpid/ha/types.cpp + qpid/ha/types.h + qpid/ha/RemoteBackup.cpp + qpid/ha/RemoteBackup.h ) add_library (ha MODULE ${ha_SOURCES}) set_target_properties (ha PROPERTIES PREFIX "") - target_link_libraries (ha qpidcommon qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY}) + target_link_libraries (ha qpidtypes qpidcommon qpidbroker) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties (ha PROPERTIES PREFIX "" @@ -672,6 +687,11 @@ include (ssl.cmake) # Check for syslog capabilities not present on all systems check_symbol_exists (LOG_AUTHPRIV "sys/syslog.h" HAVE_LOG_AUTHPRIV) check_symbol_exists (LOG_FTP "sys/syslog.h" HAVE_LOG_FTP) + +# Set default Memory Status module (Null implementation) +set (qpid_memstat_module + qpid/sys/MemStat.cpp +) # Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version set (win32_winnt_default OFF) @@ -734,7 +754,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows) qpid/sys/windows/SystemInfo.cpp qpid/sys/windows/Thread.cpp qpid/sys/windows/Time.cpp - qpid/sys/windows/MemStat.cpp qpid/client/windows/SaslFactory.cpp ${sslcommon_windows_SOURCES} ) @@ -780,41 +799,54 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) ) endif (POLLER STREQUAL poll) + # Set default System Info module + set (qpid_system_module + qpid/sys/posix/SystemInfo.cpp + ) + if (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (qpid_system_module - qpid/sys/posix/SystemInfo.cpp - ) add_definitions(-pthread) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread") if (CMAKE_COMPILER_IS_GNUCXX) set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_CATCH_UNDEFINED} -pthread") + set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") endif (CMAKE_COMPILER_IS_GNUCXX) + # On Linux override memory status module + set (qpid_memstat_module + qpid/sys/posix/MemStat.cpp + ) endif (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (qpidtypes_platform_SOURCES) - set (qpidtypes_platform_LIBS - uuid - ${Boost_SYSTEM_LIBRARY} - ) - if (CMAKE_SYSTEM_NAME STREQUAL SunOS) + # On Solaris override the system info module set (qpid_system_module qpid/sys/solaris/SystemInfo.cpp ) -# On Sun we want -lpthread -lthread as the 2nd last and last libs passed to linker + # On Sun we want -lpthread -lthread as the 2nd last and last libs passed to linker set (qpidtypes_platform_LIBS ${qpidtypes_platform_LIBS} pthread thread ) endif (CMAKE_SYSTEM_NAME STREQUAL SunOS) + if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) + # -lmalloc needed for mallinfo. + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lmalloc") + set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lmalloc") + endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) + + set (qpidtypes_platform_SOURCES) + set (qpidtypes_platform_LIBS + uuid + ${Boost_SYSTEM_LIBRARY} + ) + set (qpidcommon_platform_SOURCES qpid/sys/posix/AsynchIO.cpp qpid/sys/posix/Fork.cpp qpid/sys/posix/FileSysDir.cpp qpid/sys/posix/IOHandle.cpp qpid/sys/posix/LockFile.cpp - qpid/sys/posix/MemStat.cpp qpid/sys/posix/Mutex.cpp qpid/sys/posix/PipeHandle.cpp qpid/sys/posix/PollableCondition.cpp @@ -917,6 +949,7 @@ set (qpidcommon_SOURCES qpid/sys/Timer.cpp qpid/sys/TimerWarnings.cpp qpid/amqp_0_10/Codecs.cpp + ${qpid_memstat_module} ) add_msvc_version (qpidcommon library dll) @@ -1200,6 +1233,7 @@ set (qmf_SOURCES set (qmf_HEADERS ../include/qpid/agent/ManagementAgent.h ../include/qpid/agent/QmfAgentImportExport.h + ../include/qmf/BrokerImportExport.h ) add_msvc_version (qmf library dll) |