From 0097e83b39caabc97b532ea4cf7a841f857396a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 9 Oct 2018 12:37:48 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@645 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 2 +- PIPDocumentation.cmake | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64f06f79..eeaa8547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -541,6 +541,6 @@ if(DOXYGEN_FOUND) string(REPLACE ";" " " DOXY_INPUT "${DOXY_INPUT}") string(REPLACE ";" " " DOXY_INCLUDE_PATH "${PIP_MAIN_FOLDERS}") add_documentation(doc Doxyfile.in) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip COMPONENT doc EXCLUDE_FROM_ALL OPTIONAL) endif() diff --git a/PIPDocumentation.cmake b/PIPDocumentation.cmake index 5171d93e..e034bad2 100644 --- a/PIPDocumentation.cmake +++ b/PIPDocumentation.cmake @@ -22,7 +22,9 @@ endmacro(CONFIGURE_DOXYGEN_FILE) macro(ADD_DOCUMENTATION TARGET DOXYGEN_CONFIG_FILE) if(DOXYGEN_FOUND) configure_doxygen_file(${DOXYGEN_CONFIG_FILE} ${TARGET}) - add_custom_target(${TARGET} COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-${TARGET}) + add_custom_target("genereate.${TARGET}" COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxyfile-${TARGET}) + add_custom_target("${TARGET}" COMMAND ${CMAKE_COMMAND} -D COMPONENT=doc -P cmake_install.cmake) + add_dependencies("${TARGET}" "genereate.${TARGET}") else(DOXYGEN_FOUND) message(STATUS "Doxygen not found, can`t generate documentation") endif(DOXYGEN_FOUND)