svn commit: r896249 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt

[sh...@apache.org]

Author: shuston
Date: Tue Jan  5 22:26:30 2010
New Revision: 896249

URL: http://svn.apache.org/viewvc?rev=896249&view=rev
Log:
React properly to generated headers being in the source dir as opposed to build dir; resolves QPID-2298.

Modified:
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=896249&r1=896248&r2=896249&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue Jan  5 22:26:30 2010
@@ -98,6 +98,7 @@
 
 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 @@
 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



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org