diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-01-05 22:26:30 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-01-05 22:26:30 +0000 |
| commit | 04baddf6b91683b20a02396e8d0e9696d7723c2a (patch) | |
| tree | b73c2405baaca90b067aedd54fe7ead1ab6fcb5f /cpp/src | |
| parent | 32cfd3997754fc3a15cbaa54ab4d6e562f2d1605 (diff) | |
| download | qpid-python-04baddf6b91683b20a02396e8d0e9696d7723c2a.tar.gz | |
React properly to generated headers being in the source dir as opposed to build dir; resolves QPID-2298.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@896249 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 899dd5568c..7c19404d2a 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -98,6 +98,7 @@ execute_process(COMMAND ${PYTHON_EXECUTABLE} ${mgen_dir}/qmf-gen -c managementge else (EXISTS ${AMQP_SPEC}) message(STATUS "No AMQP spec... presume generated sources are included") + set(QPID_GENERATED_HEADERS_IN_SOURCE ON) include (rubygen.cmake) include (managementgen.cmake) endif (EXISTS ${AMQP_SPEC}) @@ -680,10 +681,18 @@ set_target_properties (qpidclient PROPERTIES VERSION ${qpidc_version}) install (TARGETS qpidclient DESTINATION ${QPID_INSTALL_LIBDIR} COMPONENT ${QPID_COMPONENT_CLIENT}) -install (DIRECTORY ../include/qpid ${CMAKE_CURRENT_BINARY_DIR}/../include/qpid +install (DIRECTORY ../include/qpid DESTINATION ${QPID_INSTALL_INCLUDEDIR} COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE} PATTERN ".svn" EXCLUDE) +# Released source artifacts from Apache have the generated headers included in +# the source tree, not the binary tree. So don't attempt to grab them when +# they're not supposed to be there. +if (NOT QPID_GENERATED_HEADERS_IN_SOURCE) + install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../include/qpid + DESTINATION ${QPID_INSTALL_INCLUDEDIR} + COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}) +endif (NOT QPID_GENERATED_HEADERS_IN_SOURCE) if (WIN32) install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/Debug/qpidclientd.dll |