From b9ca150dba27a4c9bbf380efc494be2a44939e83 Mon Sep 17 00:00:00 2001
From: Richard Hodges <hodges.r@gmail.com>
Date: Mon, 28 Jul 2014 15:16:32 +0100
Subject: [PATCH] merged from latest upstream

---
 CMakeLists.txt         | 2 ++
 include/CMakeLists.txt | 8 +++++++-
 src/CMakeLists.txt     | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20ec6c3..da1c969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,3 +28,5 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 add_library(amqp-cpp STATIC ${SRCS})
 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)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index a5aaa3b..1e063b2 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_sources(
 array.h
 booleanset.h
+callbacks.h
 channel.h
-channelhandler.h
 channelimpl.h
 classes.h
 compat_endian.h
@@ -10,6 +10,11 @@ connection.h
 connectionhandler.h
 connectionimpl.h
 decimalfield.h
+deferred.h
+deferredcancel.h
+deferredconsumer.h
+deferreddelete.h
+deferredqueue.h
 entityimpl.h
 envelope.h
 exchangetype.h
@@ -19,6 +24,7 @@ flags.h
 login.h
 message.h
 metadata.h
+monitor.h
 numericfield.h
 outbuffer.h
 receivedframe.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca51b25..798a7fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,8 @@ connectionstartokframe.h
 connectiontuneframe.h
 connectiontuneokframe.h
 consumedmessage.h
+deferredcancel.cpp
+deferredconsumer.cpp
 exception.h
 exchangebindframe.h
 exchangebindokframe.h
@@ -62,7 +64,6 @@ heartbeatframe.h
 includes.h
 messageimpl.h
 methodframe.h
-monitor.h
 protocolexception.h
 protocolheaderframe.h
 queuebindframe.h