From 882ce552d29269385db768aeef0a24bebf6edce2 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 5 Apr 2021 18:13:50 +0300 Subject: [PATCH] Avoid installing redundant files --- doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt | 2 -- doc/salome/gui/BLSURFPLUGIN/doxyfile.in | 3 ++- doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in | 3 ++- doc/salome/tui/CMakeLists.txt | 3 +-- doc/salome/tui/doxyfile.in | 3 ++- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt b/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt index 624a330..1d6ab83 100644 --- a/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt @@ -44,7 +44,5 @@ 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}/BLSURFPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/BLSURFPLUGIN) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/BLSURFPLUGIN/blsurfpluginpy_doc) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES BLSURFPLUGIN) diff --git a/doc/salome/gui/BLSURFPLUGIN/doxyfile.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile.in index 8c1c123..af0dd53 100644 --- a/doc/salome/gui/BLSURFPLUGIN/doxyfile.in +++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile.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/gui/BLSURFPLUGIN/doxyfile_py.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in index 5035ca1..a767190 100644 --- a/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in @@ -92,7 +92,8 @@ GENERATE_HTML = YES HTML_OUTPUT = blsurfpluginpy_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/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index 7ee9caf..313806b 100644 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -22,11 +22,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}/BLSURFPLUGIN)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/BLSURFPLUGIN + OPTIONAL DESTINATION ${SALOME_INSTALL_DOC}/tui PATTERN "*.md5" EXCLUDE PATTERN "*.map" EXCLUDE) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/BLSURFPLUGIN) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES BLSURFPLUGIN) diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index a96af6d..c4ce54b 100644 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -116,7 +116,8 @@ HTML_OUTPUT = . 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_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