From: vsr <vsr@opencascade.com>
Date: Tue, 6 Apr 2021 08:17:54 +0000 (+0300)
Subject: Avoid installing redundant files
X-Git-Tag: V9_7_0a1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebba1c2a8ee3ef71649dd6e23d34eeef5120987a;p=modules%2Fsmesh.git

Avoid installing redundant files
---

diff --git a/doc/salome/gui/SMESH/images/head.png b/doc/salome/gui/SMESH/images/head.png
deleted file mode 100755
index 307d9ef9a..000000000
Binary files a/doc/salome/gui/SMESH/images/head.png and /dev/null differ
diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt
index 24c9938e9..4d12f3f42 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}/SMESH)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SMESH 
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SMESH
+        OPTIONAL
         DESTINATION ${SALOME_INSTALL_DOC}/tui
         PATTERN "*.md5" EXCLUDE
         PATTERN "*.map" EXCLUDE)
-INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/SMESH) 
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES SMESH)
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 561246e2f..e123d5bb4 100644
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -119,6 +119,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               = 
diff --git a/src/Tools/padder/doc/doxyfile.in b/src/Tools/padder/doc/doxyfile.in
index 7c02edb28..74f287c5c 100644
--- a/src/Tools/padder/doc/doxyfile.in
+++ b/src/Tools/padder/doc/doxyfile.in
@@ -29,7 +29,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_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/src/Tools/padder/doc/images/head.png b/src/Tools/padder/doc/images/head.png
new file mode 100644
index 000000000..307d9ef9a
Binary files /dev/null and b/src/Tools/padder/doc/images/head.png differ