QPID_4449 - Further fixes to the build files for both automake and cmake.

Fixed some build issues affecting Windows.


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

9 files changed, 21 insertions, 17 deletions

diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 94dfbbc40f..731451754f 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -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})
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 091982f5c3..a8ff352858 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -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
 
diff --git a/qpid/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake
index 64d1b2843a..718e6fe342 100644
--- a/qpid/cpp/src/amqp.cmake
+++ b/qpid/cpp/src/amqp.cmake
@@ -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})
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index 0a8f406dbf..f5742c8081 100644
--- a/qpid/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -284,7 +284,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
 
     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; }
diff --git a/qpid/cpp/src/qpid/broker/QueueFlowLimit.h b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
index 0e83457efa..beb6c50d1b 100644
--- a/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
@@ -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();
 
diff --git a/qpid/cpp/src/qpid/store/CMakeLists.txt b/qpid/cpp/src/qpid/store/CMakeLists.txt
index 7e64b6cdc1..31623f8e84 100644
--- a/qpid/cpp/src/qpid/store/CMakeLists.txt
+++ b/qpid/cpp/src/qpid/store/CMakeLists.txt
@@ -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}
diff --git a/qpid/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake
index 21597f85d2..1d355e7ae6 100644
--- a/qpid/cpp/src/rdma.cmake
+++ b/qpid/cpp/src/rdma.cmake
@@ -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 "")
 
diff --git a/qpid/cpp/src/ssl.cmake b/qpid/cpp/src/ssl.cmake
index 1670e70209..b7ad58b9f0 100644
--- a/qpid/cpp/src/ssl.cmake
+++ b/qpid/cpp/src/ssl.cmake
@@ -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}")
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
index d23a83d54f..63afc46831 100644
--- a/qpid/cpp/src/tests/CMakeLists.txt
+++ b/qpid/cpp/src/tests/CMakeLists.txt
@@ -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 "")