Avoid installing redundant files

diff --git a/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt b/doc/salome/gui/BLSURFPLUGIN/CMakeLists.txt
index 624a330603e265fc46ba40d0eac32606002087c5..1d6ab839c73f9e52af7fe270591a77fb56d2318f 100644 (file)
--- 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 8c1c1231e021a4756b8253ae3ebe39084dd46e4c..af0dd53caa4d99460d696f127e2fa41c0ae6291a 100644 (file)
--- 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 5035ca161038acf979410f273c5fc1d8fcebe952..a7671906e305ee8ed891b04bd1b18015e608e92b 100644 (file)
--- 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 7ee9caf748a2ee422c9bc37b2399adf250eb328e..313806b2577539f0daccdeb1f88bc8baa3613ea6 100644 (file)
--- 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 a96af6dcb610e08d52085e3326aa1c81fce8efa0..c4ce54b0b0d2ea04fb27d2070a9f31738418f507 100644 (file)
--- 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               =