From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/docs/api/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cpp/docs/api') diff --git a/cpp/docs/api/CMakeLists.txt b/cpp/docs/api/CMakeLists.txt index 21e6f51caf..828d706b91 100644 --- a/cpp/docs/api/CMakeLists.txt +++ b/cpp/docs/api/CMakeLists.txt @@ -30,11 +30,13 @@ if (GEN_DOXYGEN) ${CMAKE_CURRENT_BINARY_DIR}/developer.doxygen) add_custom_target (docs-user-api COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen) add_custom_target (docs-developer COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen) + add_dependencies (docs docs-developer docs-user-api) # HTML files are generated to ./html - put those in the install. install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ - DESTINATION ${QPID_INSTALL_HTMLDIR} - COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}) + DESTINATION ${QPID_INSTALL_DOCDIR}/api/html + COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE} + ${OPTIONAL_ARG}) if (CPACK_GENERATOR STREQUAL "NSIS") set (CPACK_NSIS_MENU_LINKS "${QPID_INSTALL_HTMLDIR}/index.html" "Qpid C++ API Documentation" -- cgit v1.2.1