diff options
| author | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-11-30 19:17:28 +0000 |
| commit | acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd (patch) | |
| tree | 8b44f678894995ebe98deb128e407e6d80946668 /qpid/cpp/src/CMakeLists.txt | |
| parent | 67dd5f7e03147e1e145f8d063b7b443ede02bb2e (diff) | |
| download | qpid-python-acbde11b61d7bb3a0cdd81e1201d8565a4cbdfbd.tar.gz | |
QPID-4449 - Reverted much of the original change and re-implemented the fix in a simpler way.
The build-define _IN_QPID_BROKER is now used for modules built in the broker. The shared-pointer
changes are conditionally compiled only for in-broker cases.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1415796 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index c0cc5a4fbd..94dfbbc40f 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -586,6 +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 LINK_FLAGS "${CATCH_UNDEFINED}") install (TARGETS xml DESTINATION ${QPIDD_MODULE_DIR} @@ -622,6 +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 LINK_FLAGS "${CATCH_UNDEFINED}") install (TARGETS acl DESTINATION ${QPIDD_MODULE_DIR} @@ -669,7 +671,7 @@ if (BUILD_HA) ) add_library (ha MODULE ${ha_SOURCES}) - set_target_properties (ha PROPERTIES PREFIX "") + set_target_properties (ha PROPERTIES PREFIX "" COMPILE_FLAGS -D_IN_QPID_BROKER) target_link_libraries (ha qpidtypes qpidcommon qpidbroker qpidmessaging) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties (ha PROPERTIES @@ -1233,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}) +set_target_properties (qpidbroker PROPERTIES VERSION ${qpidbroker_version} COMPILE_FLAGS -D_IN_QPID_BROKER) if (MSVC) set_target_properties (qpidbroker PROPERTIES COMPILE_FLAGS /wd4290) endif (MSVC) @@ -1252,6 +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) install (TARGETS qpidd RUNTIME DESTINATION ${QPID_INSTALL_SBINDIR} COMPONENT ${QPID_COMPONENT_BROKER}) |