- Edit a documentation build

- make clean cleans generated files

diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
index 5d82000c0d2e6ee328c425750687ee998111f886..b2a8b73677ae682b8fb3719a852ce34e09e24011 100644 (file)
--- a/doc/doxygen/CMakeLists.txt
+++ b/doc/doxygen/CMakeLists.txt
@@ -17,16 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(indoxfiles Doxyfile_med_user.in static/header.html.in)
-SET(builddir ${CMAKE_CURRENT_BINARY_DIR})
-SET(srcdir   ${CMAKE_CURRENT_SOURCE_DIR})
-FOREACH(indoxfile ${indoxfiles})
-  STRING(REGEX REPLACE ".in" "" baseindoxfile ${indoxfile})
-  SET(input ${CMAKE_CURRENT_SOURCE_DIR}/${indoxfile})
-  SET(output ${CMAKE_CURRENT_BINARY_DIR}/${baseindoxfile})
-  CONFIGURE_FILE(${input} ${output})
-  MESSAGE(STATUS "Creation of ${output}")
-ENDFOREACH(indoxfile ${indoxfiles})
+SALOME_CONFIGURE_FILE(Doxyfile_med_user.in Doxyfile_med_user)
+SALOME_CONFIGURE_FILE(static/header.html.in static/header.html)
+
 FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/medcouplingexamples.in" input)
 FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/BuildPyExamplesFromCPP.py" pythondocexamplesgenerator)
 FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" output)
@@ -67,7 +60,12 @@ ENDFOREACH()
 ADD_CUSTOM_TARGET(usr_docs ALL
   COMMAND ${PYTHON_EXECUTABLE} ${pythondocexamplesgenerator} ${input} ${output}
   COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile_med_user
-  COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/MED''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}/doc_ref_user/html''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/MED'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/MED''')"
   VERBATIM
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   )
+  
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc_ref_user/html/ DESTINATION ${SALOME_INSTALL_DOC}/gui/MED)
+INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/MED) 
+
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES doc_ref_user)

diff --git a/doc/doxygen/Doxyfile_med_user.in b/doc/doxygen/Doxyfile_med_user.in
index 4c0349711ea5c89f512db52f3767f0ea0f68618b..d92757e1f1e86b07518aa28b72e947da8d30b65d 100644 (file)
--- a/doc/doxygen/Doxyfile_med_user.in
+++ b/doc/doxygen/Doxyfile_med_user.in
@@ -70,28 +70,28 @@ WARN_LOGFILE           = log_user
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-INPUT                  = @srcdir@/doxfiles/intro.dox \
-                         @srcdir@/doxfiles/glossary.dox \
-                         @srcdir@/doxfiles/library.dox \
-                         @srcdir@/doxfiles/medcoupling.dox \
-                         @srcdir@/doxfiles/medloader.dox \
-                         @srcdir@/doxfiles/interptools.dox \
-                         @srcdir@/doxfiles/functionalities.dox \
-                         @builddir@/medcouplingexamplesPY.dox \
-                         @srcdir@/doxfiles/gui.dox \
-                         @srcdir@/doxfiles/tools.dox \
-                         @builddir@/medcouplingexamplesCPP.dox \
-                         @srcdir@/doxfiles/medcoupling \
-                         @srcdir@/doxfiles/medloader \
-                         @srcdir@/doxfiles/interpolation \
-                         @srcdir@/doxfiles/install.dox \
-                         @srcdir@/fakesources \
-                         @srcdir@/../../src/ParaMEDMEM \
-                         @srcdir@/../../src/INTERP_KERNEL \
-                         @srcdir@/../../src/INTERP_KERNEL/Bases \
-                         @srcdir@/../../src/INTERP_KERNEL/Geometric2D \
-                         @srcdir@/../../src/MEDCoupling \
-                         @srcdir@/../../src/MEDLoader
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/intro.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/glossary.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/library.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/medcoupling.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/medloader.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/interptools.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/functionalities.dox \
+                         @CMAKE_CURRENT_BINARY_DIR@/medcouplingexamplesPY.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/gui.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/tools.dox \
+                         @CMAKE_CURRENT_BINARY_DIR@/medcouplingexamplesCPP.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/medcoupling \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/medloader \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/interpolation \
+                         @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/install.dox \
+                         @CMAKE_CURRENT_SOURCE_DIR@/fakesources \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/ParaMEDMEM \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/INTERP_KERNEL \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/INTERP_KERNEL/Bases \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/INTERP_KERNEL/Geometric2D \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/MEDCoupling \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/MEDLoader
 
 FILE_PATTERNS          = InterpKernelDEC.* \
                          OverlapDEC.* \
@@ -147,13 +147,13 @@ FILE_PATTERNS          = InterpKernelDEC.* \
 RECURSIVE              = YES
 EXCLUDE                = CVS
 EXCLUDE_PATTERNS       = *~
-EXAMPLE_PATH           = @srcdir@/../../src/ParaMEDMEM \
-                         @srcdir@/../../src/MEDCoupling/Test \
-                         @srcdir@/../../src/MEDCoupling_Swig \
-                         @srcdir@/../../src/MEDLoader/Swig
+EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/../../src/ParaMEDMEM \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/MEDCoupling/Test \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/MEDCoupling_Swig \
+                         @CMAKE_CURRENT_SOURCE_DIR@/../../src/MEDLoader/Swig
 EXAMPLE_PATTERNS       = *.cxx *.py
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = @srcdir@/figures
+IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/figures
 INPUT_FILTER           =
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
@@ -174,9 +174,9 @@ IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
-HTML_HEADER            = @builddir@/static/header.html
-HTML_FOOTER            = @srcdir@/static/footer.html
-HTML_EXTRA_STYLESHEET  = @srcdir@/static/salome_extra.css
+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
 GENERATE_HTMLHELP      = NO
 GENERATE_CHI           = YES
 BINARY_TOC             = NO