From 22d3109060d9acc372bcc3bcfc4b52849b46fb07 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 6 Apr 2021 11:08:33 +0300 Subject: [PATCH] Avoid installing redundant files --- doc/salome/gui/GEOM/CMakeLists.txt | 2 -- doc/salome/gui/GEOM/doxyfile.in | 3 ++- doc/salome/gui/GEOM/doxyfile_py.in | 3 ++- doc/salome/gui/GEOM/doxyfile_tui.in | 3 ++- doc/salome/tui/CMakeLists.txt | 3 +-- doc/salome/tui/doxyfile.in | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/salome/gui/GEOM/CMakeLists.txt b/doc/salome/gui/GEOM/CMakeLists.txt index a2c4df36d..88aa475cf 100644 --- a/doc/salome/gui/GEOM/CMakeLists.txt +++ b/doc/salome/gui/GEOM/CMakeLists.txt @@ -78,8 +78,6 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM DESTINATION ${SALOME_INSTALL_DOC}/gui) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM/geompy_doc) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/static/SALOME_BOA_PA.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/static/ExtractAndRebuild.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM) INSTALL(FILES input/geompy_migration.doc input/tui_auto_completion_documentation.doc input/tui_execution_distribution.doc DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM/input) diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in index a7dcce112..2785ded48 100644 --- a/doc/salome/gui/GEOM/doxyfile.in +++ b/doc/salome/gui/GEOM/doxyfile.in @@ -30,7 +30,8 @@ GENERATE_HTML = YES HTML_OUTPUT = . 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_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css +HTML_EXTRA_FILES = @CMAKE_CURRENT_SOURCE_DIR@/images/head.png TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in index a533f355f..ea03e0e96 100644 --- a/doc/salome/gui/GEOM/doxyfile_py.in +++ b/doc/salome/gui/GEOM/doxyfile_py.in @@ -97,7 +97,8 @@ GENERATE_HTML = YES HTML_OUTPUT = geompy_doc HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header_py.html HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html -HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css +HTML_EXTRA_FILES = @CMAKE_CURRENT_SOURCE_DIR@/images/head.png TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in index c3aa314c0..69fb2d4b4 100644 --- a/doc/salome/gui/GEOM/doxyfile_tui.in +++ b/doc/salome/gui/GEOM/doxyfile_tui.in @@ -28,7 +28,8 @@ GENERATE_HTML = YES HTML_OUTPUT = . 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_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css +HTML_EXTRA_FILES = @CMAKE_CURRENT_SOURCE_DIR@/images/head.png TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index 27e53e202..efcbca4ed 100644 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -25,11 +25,10 @@ SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE}) -INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM + OPTIONAL DESTINATION ${SALOME_INSTALL_DOC}/tui PATTERN "*.md5" EXCLUDE PATTERN "*.map" EXCLUDE) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/GEOM) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES GEOM) diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 31839eae5..b47718a0d 100644 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -120,6 +120,7 @@ HTML_FILE_EXTENSION = .html 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_EXTRA_FILES = @CMAKE_CURRENT_SOURCE_DIR@/images/head.png HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = -- 2.39.2