merged from latest upstream

This commit is contained in:
Richard Hodges 2014-07-28 15:16:32 +01:00
parent b41e2edc52
commit b9ca150dba
3 changed files with 11 additions and 2 deletions

View File

@ -28,3 +28,5 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
add_library(amqp-cpp STATIC ${SRCS}) add_library(amqp-cpp STATIC ${SRCS})
target_include_directories(amqp-cpp SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}) target_include_directories(amqp-cpp SYSTEM PUBLIC ${PROJECT_SOURCE_DIR})
set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
set(AMQP-CPP_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)

View File

@ -1,8 +1,8 @@
add_sources( add_sources(
array.h array.h
booleanset.h booleanset.h
callbacks.h
channel.h channel.h
channelhandler.h
channelimpl.h channelimpl.h
classes.h classes.h
compat_endian.h compat_endian.h
@ -10,6 +10,11 @@ connection.h
connectionhandler.h connectionhandler.h
connectionimpl.h connectionimpl.h
decimalfield.h decimalfield.h
deferred.h
deferredcancel.h
deferredconsumer.h
deferreddelete.h
deferredqueue.h
entityimpl.h entityimpl.h
envelope.h envelope.h
exchangetype.h exchangetype.h
@ -19,6 +24,7 @@ flags.h
login.h login.h
message.h message.h
metadata.h metadata.h
monitor.h
numericfield.h numericfield.h
outbuffer.h outbuffer.h
receivedframe.h receivedframe.h

View File

@ -42,6 +42,8 @@ connectionstartokframe.h
connectiontuneframe.h connectiontuneframe.h
connectiontuneokframe.h connectiontuneokframe.h
consumedmessage.h consumedmessage.h
deferredcancel.cpp
deferredconsumer.cpp
exception.h exception.h
exchangebindframe.h exchangebindframe.h
exchangebindokframe.h exchangebindokframe.h
@ -62,7 +64,6 @@ heartbeatframe.h
includes.h includes.h
messageimpl.h messageimpl.h
methodframe.h methodframe.h
monitor.h
protocolexception.h protocolexception.h
protocolheaderframe.h protocolheaderframe.h
queuebindframe.h queuebindframe.h