From f73ada5b3d32a4d702eb7d46f5757dd24917e4db Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 21 Oct 2013 08:28:53 +0000 Subject: [PATCH] Improve make dev_docs step: - It does not install anything; only generates output with doxygen - make install installs output files generated by make dev_docs - make clean cleans generated files --- doc/salome/tui/CMakeLists.txt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index bff14febd..0974627e2 100755 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -20,17 +20,10 @@ SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) -ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} -u - COMMAND ${DOXYGEN_EXECUTABLE} - COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_CURRENT_BINARY_DIR}/doxyfile.bak''')" - COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/KERNEL''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}/KERNEL''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/KERNEL'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/KERNEL''')" - VERBATIM - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -) +ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE}) -# TODO -# - Stop using shutil.rmtree() to clear installation directory - this is not safe -# (as the directory can potentically point to custom location)! Moreover, currently, it remove -# the documentation generated with Sphinx (from docutils)! -# - Redesign dev_docs rule: 'make dev_docs' should generate documentation and 'make install' -# should the install it. Other solution: split dev_docs to two steps: dev_docs and install_dev_docs. +INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL DESTINATION ${SALOME_INSTALL_DOC}/tui) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/KERNEL) + +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES KERNEL) -- 2.39.2