You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2012/12/03 18:10:43 UTC
svn commit: r1416594 - in /qpid/trunk/qpid/cpp:
managementgen/qmfgen/templates/ src/ src/qpid/broker/ src/qpid/store/
src/tests/
Author: tross
Date: Mon Dec 3 17:10:40 2012
New Revision: 1416594
URL: http://svn.apache.org/viewvc?rev=1416594&view=rev
Log:
QPID_4449 - Further fixes to the build files for both automake and cmake.
Fixed some build issues affecting Windows.
Modified:
qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/amqp.cmake
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt
qpid/trunk/qpid/cpp/src/rdma.cmake
qpid/trunk/qpid/cpp/src/ssl.cmake
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h (original)
+++ qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h Mon Dec 3 17:10:40 2012
@@ -36,8 +36,8 @@ namespace qmf {
private:
static void writeSchema (std::string& schema);
static uint8_t md5Sum[MD5_LEN];
- /*MGEN:Root.ExternMethod*/ static std::string packageName;
- /*MGEN:Root.ExternMethod*/ static std::string eventName;
+ static std::string packageName;
+ static std::string eventName;
/*MGEN:Event.ArgDeclarations*/
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Dec 3 17:10:40 2012
@@ -586,7 +586,7 @@ if (BUILD_XML)
target_link_libraries (xml xerces-c xqilla qpidbroker pthread)
set_target_properties (xml PROPERTIES
PREFIX ""
- COMPILE_FLAGS -D_IN_QPID_BROKER
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS xml
DESTINATION ${QPIDD_MODULE_DIR}
@@ -623,7 +623,7 @@ if (BUILD_ACL)
target_link_libraries (acl qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY})
set_target_properties (acl PROPERTIES
PREFIX ""
- COMPILE_FLAGS -D_IN_QPID_BROKER
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS acl
DESTINATION ${QPIDD_MODULE_DIR}
@@ -671,7 +671,7 @@ if (BUILD_HA)
)
add_library (ha MODULE ${ha_SOURCES})
- set_target_properties (ha PROPERTIES PREFIX "" COMPILE_FLAGS -D_IN_QPID_BROKER)
+ set_target_properties (ha PROPERTIES PREFIX "" COMPILE_DEFINITIONS _IN_QPID_BROKER)
target_link_libraries (ha qpidtypes qpidcommon qpidbroker qpidmessaging)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties (ha PROPERTIES
@@ -1235,7 +1235,7 @@ set (qpidbroker_SOURCES
add_msvc_version (qpidbroker library dll)
add_library (qpidbroker SHARED ${qpidbroker_SOURCES})
target_link_libraries (qpidbroker qpidcommon ${qpidbroker_platform_LIBS})
-set_target_properties (qpidbroker PROPERTIES VERSION ${qpidbroker_version} COMPILE_FLAGS -D_IN_QPID_BROKER)
+set_target_properties (qpidbroker PROPERTIES VERSION ${qpidbroker_version} COMPILE_DEFINITIONS _IN_QPID_BROKER)
if (MSVC)
set_target_properties (qpidbroker PROPERTIES COMPILE_FLAGS /wd4290)
endif (MSVC)
@@ -1254,7 +1254,7 @@ add_msvc_version (qpidd application exe)
add_executable (qpidd ${qpidd_SOURCES})
target_link_libraries (qpidd qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY})
-set_target_properties (qpidd PROPERTIES COMPILE_FLAGS -D_IN_QPID_BROKER)
+set_target_properties (qpidd PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
install (TARGETS qpidd RUNTIME
DESTINATION ${QPID_INSTALL_SBINDIR}
COMPONENT ${QPID_COMPONENT_BROKER})
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Dec 3 17:10:40 2012
@@ -260,7 +260,7 @@ rdma_la_LIBADD = \
-libverbs
rdma_la_LDFLAGS = $(PLUGINLDFLAGS)
rdma_la_CXXFLAGS = \
- $(AM_CXXFLAGS) -Wno-missing-field-initializers
+ $(AM_CXXFLAGS) -Wno-missing-field-initializers -D_IN_QPID_BROKER
dmoduleexec_LTLIBRARIES += \
rdma.la
Modified: qpid/trunk/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/amqp.cmake?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/amqp.cmake (original)
+++ qpid/trunk/qpid/cpp/src/amqp.cmake Mon Dec 3 17:10:40 2012
@@ -82,7 +82,7 @@ if (BUILD_AMQP)
PREFIX ""
COMPILE_FLAGS "${PROTON_COMPILE_FLAGS}"
LINK_FLAGS "${PROTON_LINK_FLAGS}")
- set_target_properties (amqp PROPERTIES COMPILE_FLAGS -D_IN_QPID_BROKER)
+ set_target_properties (amqp PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
install (TARGETS amqp
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Mon Dec 3 17:10:40 2012
@@ -284,7 +284,7 @@ class Broker : public sys::Runnable, pub
boost::function<std::vector<Url> ()> getKnownBrokers;
- static QPID_BROKER_EXTERN const std::string TCP_TRANSPORT;
+ static const std::string TCP_TRANSPORT;
void setRecovery(bool set) { recovery = set; }
bool getRecovery() const { return recovery; }
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h Mon Dec 3 17:10:40 2012
@@ -69,10 +69,10 @@ struct QueueSettings;
uint64_t size;
public:
- static QPID_BROKER_EXTERN const std::string flowStopCountKey;
- static QPID_BROKER_EXTERN const std::string flowResumeCountKey;
- static QPID_BROKER_EXTERN const std::string flowStopSizeKey;
- static QPID_BROKER_EXTERN const std::string flowResumeSizeKey;
+ static const std::string flowStopCountKey;
+ static const std::string flowResumeCountKey;
+ static const std::string flowStopSizeKey;
+ static const std::string flowResumeSizeKey;
QPID_BROKER_EXTERN virtual ~QueueFlowLimit();
Modified: qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt Mon Dec 3 17:10:40 2012
@@ -42,7 +42,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties (store PROPERTIES
PREFIX ""
- COMPILE_FLAGS -D_IN_QPID_BROKER
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
@@ -56,7 +56,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
set_target_properties (store PROPERTIES
- COMPILE_FLAGS -D_IN_QPID_BROKER
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
VERSION ${qpidc_version})
install (TARGETS store # RUNTIME
DESTINATION ${QPIDD_MODULE_DIR}
@@ -84,6 +84,7 @@ if (BUILD_MSSQL)
ms-sql/State.cpp
ms-sql/TplRecordset.cpp
ms-sql/VariantHelper.cpp)
+ set_target_properties (mssql_store PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
target_link_libraries (mssql_store qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY})
install (TARGETS mssql_store # RUNTIME
DESTINATION ${QPIDD_MODULE_DIR}
@@ -113,6 +114,7 @@ if (BUILD_MSCLFS)
ms-sql/State.cpp
ms-sql/VariantHelper.cpp)
include_directories(ms-sql)
+ set_target_properties (msclfs_store PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
target_link_libraries (msclfs_store qpidbroker qpidcommon ${Boost_PROGRAM_OPTIONS_LIBRARY} clfsw32.lib)
install (TARGETS msclfs_store # RUNTIME
DESTINATION ${QPIDD_MODULE_DIR}
Modified: qpid/trunk/qpid/cpp/src/rdma.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/rdma.cmake?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/rdma.cmake (original)
+++ qpid/trunk/qpid/cpp/src/rdma.cmake Mon Dec 3 17:10:40 2012
@@ -79,6 +79,7 @@ if (BUILD_RDMA)
add_library (rdma MODULE qpid/sys/RdmaIOPlugin.cpp)
target_link_libraries (rdma qpidbroker rdmawrap)
set_target_properties (rdma PROPERTIES
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
LINK_FLAGS "${CATCH_UNDEFINED}"
PREFIX "")
Modified: qpid/trunk/qpid/cpp/src/ssl.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ssl.cmake?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/ssl.cmake (original)
+++ qpid/trunk/qpid/cpp/src/ssl.cmake Mon Dec 3 17:10:40 2012
@@ -90,7 +90,8 @@ if (BUILD_SSL)
target_link_libraries (ssl qpidbroker sslcommon ${Boost_PROGRAM_OPTIONS_LIBRARY})
set_target_properties (ssl PROPERTIES
PREFIX ""
- COMPILE_FLAGS "${NSS_COMPILE_FLAGS} -D_IN_QPID_BROKER")
+ COMPILE_FLAGS "${NSS_COMPILE_FLAGS}"
+ COMPILE_DEFINITIONS _IN_QPID_BROKER)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(ssl PROPERTIES
LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1416594&r1=1416593&r2=1416594&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Mon Dec 3 17:10:40 2012
@@ -158,7 +158,7 @@ add_executable (unit_test unit_test
target_link_libraries (unit_test
${qpid_test_boost_libs}
qpidmessaging qpidbroker qmfconsole)
-set_target_properties (unit_test PROPERTIES COMPILE_FLAGS -D_IN_QPID_BROKER)
+set_target_properties (unit_test PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER)
remember_location(unit_test)
add_library (shlibtest MODULE shlibtest.cpp)
@@ -329,7 +329,7 @@ endif (PYTHON_EXECUTABLE)
add_library(test_store MODULE test_store.cpp)
target_link_libraries (test_store qpidbroker qpidcommon)
set_target_properties (test_store PROPERTIES
- COMPILE_FLAGS -D_IN_QPID_BROKER
+ COMPILE_DEFINITIONS _IN_QPID_BROKER
PREFIX "")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org