From: vsr <vsr@opencascade.com>
Date: Mon, 5 Apr 2021 16:58:49 +0000 (+0300)
Subject: Avoid installing redundant files
X-Git-Tag: V9_7_0a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=683da0a20d9e0140af7fa7118b853dce0f10fca5;p=modules%2Fkernel.git

Avoid installing redundant files
---

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 231a68cb2..4bea2f322 100644
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -54,7 +54,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}/KERNEL DESTINATION ${SALOME_INSTALL_DOC}/gui)
-INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/KERNEL) 
 
 SET(MAKE_CLEAN_FILES KERNEL log.txt)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${MAKE_CLEAN_FILES}")
diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in
index fc5033f5a..1143e0bdb 100644
--- a/doc/salome/gui/doxyfile.in
+++ b/doc/salome/gui/doxyfile.in
@@ -127,6 +127,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/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt
index aae15ed6e..40bb4f0f4 100644
--- a/doc/salome/tui/CMakeLists.txt
+++ b/doc/salome/tui/CMakeLists.txt
@@ -52,12 +52,11 @@ ADD_CUSTOM_TARGET(dev_docs ${CMAKE_COMMAND} -E make_directory tmp
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}             
 )
 
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL)")
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL 
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL
+        OPTIONAL
         DESTINATION ${SALOME_INSTALL_DOC}/tui
-	PATTERN "*.md5" EXCLUDE
-	PATTERN "*.map" EXCLUDE)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/KERNEL)
+        PATTERN "*.md5" EXCLUDE
+        PATTERN "*.map" EXCLUDE)
 
 SET(MAKE_CLEAN_FILES KERNEL log.txt)
 
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 1e4d110b1..ebd1ae8ab 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               =