diff options
| author | Alan Conway <aconway@apache.org> | 2009-07-15 16:45:21 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-07-15 16:45:21 +0000 |
| commit | 366916dc747b462858252271a6993d244f59768a (patch) | |
| tree | de0f1a27ff50058c6f8e084c9ac1595892032f00 /cpp/examples | |
| parent | 6bcc8e7c8591c623fdcc5c75f6e3759bbe27eeca (diff) | |
| download | qpid-python-366916dc747b462858252271a6993d244f59768a.tar.gz | |
Merge branch 'move_public_h_to_include' into trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@794325 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/examples')
| -rw-r--r-- | cpp/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cpp/examples/makedist.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt index a381dbe023..34dfa340ce 100644 --- a/cpp/examples/CMakeLists.txt +++ b/cpp/examples/CMakeLists.txt @@ -24,7 +24,7 @@ endif(COMMAND cmake_policy) # This will probably need some fiddling to get right for installed kits. get_directory_property(QPIDC_TOP PARENT_DIRECTORY) -include_directories(${QPIDC_TOP}/src ${CMAKE_CURRENT_BINARY_DIR}/../src/gen) +include_directories(${QPIDC_TOP}/include ${CMAKE_CURRENT_BINARY_DIR}/../src/gen) # Shouldn't need this... but there are still client header inclusions of Boost. include_directories( ${Boost_INCLUDE_DIR} ) diff --git a/cpp/examples/makedist.mk b/cpp/examples/makedist.mk index 391ddf47e7..9fd4ee6e28 100644 --- a/cpp/examples/makedist.mk +++ b/cpp/examples/makedist.mk @@ -1,6 +1,6 @@ # Settings to build the examples in automake AM_CXXFLAGS = $(WARNING_CFLAGS) -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/gen -I$(top_builddir)/src -I$(top_builddir)/src/gen +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/gen -I$(top_builddir)/src/gen CLIENT_LIB=$(top_builddir)/src/libqpidclient.la CONSOLE_LIB=$(top_builddir)/src/libqmfconsole.la CLIENTFLAGS=-lqpidclient |