From 7d1b340d729006a8e010cfaa9820f42c0816ed5c Mon Sep 17 00:00:00 2001 From: mpa Date: Tue, 22 Oct 2013 12:31:28 +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 | 20 +++++++++----------- doc/salome/tui/doxyfile.in | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index 510a42fa0..bba692050 100644 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -17,15 +17,13 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(indoxfiles doxyfile.in static/header.html.in) -FOREACH(indoxfile ${indoxfiles}) - STRING(REGEX REPLACE ".in" "" baseindoxfile ${indoxfile}) - SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${indoxfile}) - SET(output ${CMAKE_CURRENT_BINARY_DIR}/${baseindoxfile}) - CONFIGURE_FILE(${input} ${output}) - MESSAGE(STATUS "Creation of ${output}") -ENDFOREACH(indoxfile ${indoxfiles}) +SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) +SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) -ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} - COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/tui/MED''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}/MED''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/tui/MED'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/tui/MED''')" - VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE}) + +INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MED)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/MED DESTINATION ${SALOME_INSTALL_DOC}/tui) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/MED) + +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES MED) \ No newline at end of file diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 9bea0fb77..674a43646 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -35,7 +35,7 @@ ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = @top_srcdir@ @top_builddir@ +STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@ @PROJECT_BINARY_DIR@ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES @@ -95,11 +95,11 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @top_srcdir@/src \ - @top_srcdir@/bin \ - @top_srcdir@/idl \ - @top_builddir@/bin \ - @srcdir@/input +INPUT = @PROJECT_SOURCE_DIR@/src \ + @PROJECT_SOURCE_DIR@/bin \ + @PROJECT_SOURCE_DIR@/idl \ + @PROJECT_BINARY_DIR@/bin \ + @CMAKE_CURRENT_SOURCE_DIR@/input FILE_PATTERNS = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx @DOXYGEN_PYTHON_EXTENSION@ *.doc RECURSIVE = YES EXCLUDE = @@ -108,7 +108,7 @@ EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = YES @@ -137,9 +137,9 @@ IGNORE_PREFIX = GENERATE_HTML = YES HTML_OUTPUT = . HTML_FILE_EXTENSION = .html -HTML_HEADER = @builddir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = -- 2.39.2