From 6fcfc0475deb28e2089d8e3af3f3894fed78d065 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Tue, 22 Dec 2015 21:41:32 +0100 Subject: [PATCH] =?utf8?q?mise=20en=20forme=20de=20la=20doc=20de=20r=C3=A9?= =?utf8?q?f=C3=A9rence=20en=20anglais?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- doc/salome/gui/CMakeLists.txt | 13 ------------- doc/salome/gui/HYDRO/CMakeLists.txt | 3 +-- doc/salome/gui/HYDRO/doxyfile.in | 2 +- doc/salome/gui/HYDRO/static/footer.html | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index 11b406a3..047df8e1 100644 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -21,16 +21,3 @@ # ADD_SUBDIRECTORY(HYDRO) - -# SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) -# #SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) -# -# ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE}) -# -# ADD_DEPENDENCIES(usr_docs html_docs) -# -# INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") -# INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYDRO DESTINATION ${SALOME_INSTALL_DOC}/gui) -# #INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO) -# -# SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES GUI) diff --git a/doc/salome/gui/HYDRO/CMakeLists.txt b/doc/salome/gui/HYDRO/CMakeLists.txt index 4f1a9bc3..6aeba5ef 100644 --- a/doc/salome/gui/HYDRO/CMakeLists.txt +++ b/doc/salome/gui/HYDRO/CMakeLists.txt @@ -21,7 +21,6 @@ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) SALOME_CONFIGURE_FILE(static/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header.html) -#SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header_py.html) ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE}) @@ -29,6 +28,6 @@ ADD_DEPENDENCIES(usr_docs html_docs) INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYDRO DESTINATION ${SALOME_INSTALL_DOC}/gui) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES HYDRO) diff --git a/doc/salome/gui/HYDRO/doxyfile.in b/doc/salome/gui/HYDRO/doxyfile.in index c48f4f11..21aa3194 100644 --- a/doc/salome/gui/HYDRO/doxyfile.in +++ b/doc/salome/gui/HYDRO/doxyfile.in @@ -43,7 +43,7 @@ IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images \ #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @CMAKE_CURRENT_SOURCE_DIR@/static/header.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 TOC_EXPAND = YES diff --git a/doc/salome/gui/HYDRO/static/footer.html b/doc/salome/gui/HYDRO/static/footer.html index affd43d8..a7b8b641 100644 --- a/doc/salome/gui/HYDRO/static/footer.html +++ b/doc/salome/gui/HYDRO/static/footer.html @@ -4,7 +4,7 @@ -- 2.39.2