Merge branch 'BR_H2018_DRAFT' into BR_2018_V8_5

[modules/hydro.git] / doc / salome / tutorial / CMakeLists.txt

diff --git a/doc/salome/tutorial/CMakeLists.txt b/doc/salome/tutorial/CMakeLists.txt
index b5bfa74fcb69ca59734e18108d23362f87b94b67..ff18d50612598fb70ed91d5bfe2a5b3f46d0aa57 100644 (file)
--- a/doc/salome/tutorial/CMakeLists.txt
+++ b/doc/salome/tutorial/CMakeLists.txt
@@ -26,9 +26,12 @@ SET(RSTFILES
   index.rst
   installationLancementSalome.rst
   interpolationZ.rst
+  introCloudCompare.rst
+  introQgis.rst
   lancementCalcul.rst
   landCoverMap.rst
   maillage.rst
+  manipsPolys.rst
   miseEnDonneesTelemac.rst
   objetsArtificiels.rst
   objetsNaturels.rst
@@ -48,19 +51,15 @@ SET(ALLSPHINXOPTS -d doctrees ${PAPEROPT_a4} ${SPHINXOPTS} ${SOURCEDIR})
 
 SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
-SET(HTML_ROOT_FILE html/index.html)
-
-ADD_CUSTOM_COMMAND(OUTPUT ${HTML_ROOT_FILE} 
+ADD_CUSTOM_TARGET(BUILD_HTML ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory html 
   COMMAND ${CMAKE_COMMAND} -E make_directory doctrees
   COMMAND ${SPHINX_EXECUTABLE} -c ${CMAKE_BINARY_DIR}/doc/salome/tutorial -b html ${ALLSPHINXOPTS} html
   DEPENDS ${RSTFILES}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
-
-SET(PDF_ROOT_FILE latex/Makefile)
-
-ADD_CUSTOM_COMMAND(OUTPUT ${PDF_ROOT_FILE} 
+ 
+ADD_CUSTOM_TARGET(BUILD_PDF ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory latex 
   COMMAND ${SPHINX_EXECUTABLE} -c ${CMAKE_BINARY_DIR}/doc/salome/tutorial -b latex ${ALLSPHINXOPTS} latex
   COMMAND make -C latex all-pdf
@@ -68,9 +67,13 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PDF_ROOT_FILE}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-ADD_CUSTOM_TARGET(BUILD_HTML ALL DEPENDS ${PDF_ROOT_FILE} ${HTML_ROOT_FILE})
-
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ 
   DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_tutorial
   PATTERN ".buildinfo" EXCLUDE
 )
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/latex/moduleHYDRO_tutoriel.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_tutorial)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SALOME_Memo.pdf DESTINATION ${SALOME_INSTALL_DOC}/gui/HYDRO_tutorial)
+
+ADD_SUBDIRECTORY(english)
+