diff options
| author | Alan Conway <aconway@apache.org> | 2009-07-27 21:32:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-07-27 21:32:16 +0000 |
| commit | 77e93f5453f3b9878c3e27b0e99a365356c5264c (patch) | |
| tree | c6e72c764dab31648c39de97ec7154e893662eb5 /cpp/examples | |
| parent | bcf89b1af8b1d4a0262530b50e5433cdaffb91f0 (diff) | |
| download | qpid-python-77e93f5453f3b9878c3e27b0e99a365356c5264c.tar.gz | |
Separate generated public header files from non-public headers, generated code re-organization.
The gen/ directory has been removed, code is now generated into:
$(builddir)/src - all .cpp files and non-public .h files.
$(builddir)/include - all public .h files.
The gen/ directory was originally intended to separate generated code
from hand-written code. However both automake and cmake allow you to
direct all build output, including generated code, into a separate
build directory. In fact both recommend you build this way.
Keeping the gen/ directory meant there would have been a total of 8
places to look for header files, all the combinations of
builddir/srcdir, src/include and gen/no-gen. This was a mess, 4 is bad
enough.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@798291 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/examples')
| -rw-r--r-- | cpp/examples/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cpp/examples/makedist.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt index 34dfa340ce..7d0a4d0d21 100644 --- a/cpp/examples/CMakeLists.txt +++ b/cpp/examples/CMakeLists.txt @@ -24,7 +24,8 @@ 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}/include ${CMAKE_CURRENT_BINARY_DIR}/../src/gen) +include_directories(${CMAKE_BINARY_DIR}/include) +include_directories(${CMAKE_SOURCE_DIR}/include) # 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 9fd4ee6e28..0a7f18de76 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)/include -I$(top_srcdir)/src/gen -I$(top_builddir)/src/gen +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include CLIENT_LIB=$(top_builddir)/src/libqpidclient.la CONSOLE_LIB=$(top_builddir)/src/libqmfconsole.la CLIENTFLAGS=-lqpidclient |