diff options
| author | Charles E. Rolke <chug@apache.org> | 2013-10-04 17:41:50 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2013-10-04 17:41:50 +0000 |
| commit | b5e8213e065218d4f1c21bb4819f6420c4d3fcd1 (patch) | |
| tree | 7cb65b0a4714a106dc0bf9966278bbfa98c07273 /qpid/cpp/src/amqp.cmake | |
| parent | 9e1b387c6b52bc8077650fbc96bf0329e05c1f27 (diff) | |
| download | qpid-python-b5e8213e065218d4f1c21bb4819f6420c4d3fcd1.tar.gz | |
QPID-5115: AMQP 1.0 client support built in to qpidmessaging for all platforms
This commit disposes of the amqpc library and moves the functions into the
qpidmessaging library. Now any client that loads qpidmessaging gets amqp0-10
and amqp1.0 selectable through the connection protocol option. C++ brokers
still must load the amqp library to enable 1.0 support.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529235 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/amqp.cmake')
| -rw-r--r-- | qpid/cpp/src/amqp.cmake | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/qpid/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake index 133fb5c051..52316d22b3 100644 --- a/qpid/cpp/src/amqp.cmake +++ b/qpid/cpp/src/amqp.cmake @@ -163,15 +163,6 @@ if (BUILD_AMQP) qpid/messaging/amqp/TcpTransport.h qpid/messaging/amqp/TcpTransport.cpp ) - add_library (amqpc MODULE ${amqpc_SOURCES}) - target_link_libraries (amqpc qpidmessaging qpidtypes qpidclient qpidcommon ${PROTON_LIBRARIES}) - set_target_properties (amqpc PROPERTIES - PREFIX "" - LINK_FLAGS "${CATCH_UNDEFINED}") - - install (TARGETS amqpc - DESTINATION ${QPIDC_MODULE_DIR} - COMPONENT ${QPID_COMPONENT_CLIENT}) if (WIN32) set(proton_dll "${PROTON_LIBRARY_DIRS}/${PROTON_LIBRARIES}.dll") @@ -186,4 +177,8 @@ if (BUILD_AMQP) COMPONENT ${QPID_COMPONENT_COMMON} CONFIGURATIONS Debug) endif (WIN32) +else (BUILD_AMQP) + # ensure that qpid build ignores proton + UNSET( amqpc_SOURCES ) + UNSET( PROTON_LIBRARIES ) endif (BUILD_AMQP) |