Avoid installing redundant files

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 231a68cb224d6ff1916f27d724045fff0456adb1..4bea2f32241105659c6d0ae36b5021ab8492f7ed 100644 (file)
--- 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 fc5033f5aa7b58135b2913d0eb2904f09e255deb..1143e0bdbc540ac472dafe6da9e3a6209b836383 100644 (file)
--- 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 aae15ed6e18388b0ad515197d4808d0f8a1ef7dc..40bb4f0f4d0920e46c2cd80a422b1863ad7eae8e 100644 (file)
--- 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 1e4d110b1e2bf562178d7dcd2edca4828e19605c..ebd1ae8abc5e1fc88117c4b355e33badd4a6be73 100644 (file)
--- 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               =