From 30efe723a2a4d0f6b077045369405c1bd1636b47 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 30 Oct 2012 18:51:41 +0000 Subject: NO-JIRA: shamelessly stole some cmake improvements from proton: - Don't generate the docs all the time (unless we have to) - Take a guess as to whether to use lib or lib64 to install libraries (This can be overridden in distribution package builds) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1403812 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/api/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/docs/api') diff --git a/qpid/cpp/docs/api/CMakeLists.txt b/qpid/cpp/docs/api/CMakeLists.txt index 1c2e72394c..828d706b91 100644 --- a/qpid/cpp/docs/api/CMakeLists.txt +++ b/qpid/cpp/docs/api/CMakeLists.txt @@ -28,13 +28,15 @@ if (GEN_DOXYGEN) ${CMAKE_CURRENT_BINARY_DIR}/user.doxygen) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/developer.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/developer.doxygen) - add_custom_target (docs-user-api ALL COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen) - add_custom_target (docs-developer ALL COMMAND ${DOXYGEN_EXECUTABLE} 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_DOCDIR}/api/html - COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE}) + 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