Additional changes to documentation build procedure

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 154d1e5eb6c2f7d46f36213e4dbfab09e98e4d2b..bdb5c4ef45548cf50b2a3c82b7d4234c91779180 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,18 +47,16 @@ FIND_PACKAGE(SalomeSphinx)
 
 # Directories
 # =========
-SET(SALOME_DOCUMENTATION_EXTRA_INSTALL extra CACHE PATH "Install path: SALOME Extra documentation")
-SET(SALOME_DOCUMENTATION_GIT_INSTALL dev/git CACHE PATH "Install path: SALOME Git documentation")
-SET(SALOME_DOCUMENTATION_CMAKE_INSTALL dev/cmake CACHE PATH "Install path: SALOME CMake documentation")
-SET(SALOME_DOCUMENTATION_GUI_INSTALL gui CACHE PATH "Install path: SALOME GUI documentation")
-SET(SALOME_DOCUMENTATION_TUI_INSTALL tui CACHE PATH "Install path: SALOME TUI documentation")
+SET(SALOME_INSTALL_DOC_GUI   gui   CACHE PATH "Install path: user documentation")
+SET(SALOME_INSTALL_DOC_TUI   tui   CACHE PATH "Install path: developer documentation")
+SET(SALOME_INSTALL_DOC_DEV   dev   CACHE PATH "Install path: additional developer documentation")
+SET(SALOME_INSTALL_DOC_EXTRA extra CACHE PATH "Install path: extra documentation")
 
 MARK_AS_ADVANCED(
- SALOME_DOCUMENTATION_EXTRA_INSTALL
- SALOME_DOCUMENTATION_GIT_INSTALL
- SALOME_DOCUMENTATION_CMAKE_INSTALL
- SALOME_DOCUMENTATION_GUI_INSTALL 
- SALOME_DOCUMENTATION_TUI_INSTALL
+ SALOME_INSTALL_DOC_GUI 
+ SALOME_INSTALL_DOC_TUI
+ SALOME_INSTALL_DOC_DEV
+ SALOME_INSTALL_DOC_EXTRA
 )
 
 # Sources 

diff --git a/dev/cmake/CMakeLists.txt b/dev/cmake/CMakeLists.txt
index e84d5def1bb44cc6ecd7aaa0e769e4e4d298991c..31c5c8f812e0683e5c146af2c0f5eefa4fa62d32 100644 (file)
--- a/dev/cmake/CMakeLists.txt
+++ b/dev/cmake/CMakeLists.txt
@@ -27,4 +27,4 @@ SALOME_ADD_SPHINX_DOC( html cmake_doc ${CMAKE_CURRENT_SOURCE_DIR}/source)
 
 # Install rules
 # ==========
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build/html DESTINATION ${SALOME_DOCUMENTATION_CMAKE_INSTALL}/build)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build/html DESTINATION ${SALOME_INSTALL_DOC_DEV}/cmake)

diff --git a/dev/git/CMakeLists.txt b/dev/git/CMakeLists.txt
index e349eacd6f4d25624093a8692edcae4118dff4df..cc21e46d3bb0e45723bf1aea04cf47f04e9aa606 100644 (file)
--- a/dev/git/CMakeLists.txt
+++ b/dev/git/CMakeLists.txt
@@ -27,7 +27,7 @@ SALOME_ADD_SPHINX_DOC( html git_doc ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Install rules
 # ==========
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build/html DESTINATION ${SALOME_DOCUMENTATION_GIT_INSTALL}/build)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build/html DESTINATION ${SALOME_INSTALL_DOC_DEV}/git)
 
 FILE(GLOB COMMON_DOCX_FIELS "${CMAKE_CURRENT_SOURCE_DIR}/*.docx")
-INSTALL(FILES ${COMMON_DOCX_FIELS} DESTINATION ${SALOME_DOCUMENTATION_GIT_INSTALL})
+INSTALL(FILES ${COMMON_DOCX_FIELS} DESTINATION ${SALOME_INSTALL_DOC_DEV}/git)

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 392c2e36177048f443a4e697cc70cf599edd885e..a4a56f1df952d2b22df73e4640de8cf263e4ad1f 100644 (file)
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -20,4 +20,4 @@
 # Install rules
 # ===========
 FILE(GLOB COMMON_PDF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.pdf")
-INSTALL(FILES ${COMMON_PDF_FILES} DESTINATION ${SALOME_DOCUMENTATION_EXTRA_INSTALL})
+INSTALL(FILES ${COMMON_PDF_FILES} DESTINATION ${SALOME_INSTALL_DOC_EXTRA})

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 425f0954853e1c4c127a268e4ee689ae35ec925c..debcbfbbdd313fb3de6eb2c38130f8307c78ff01 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -20,4 +20,4 @@
 
 # Install rules
 # ==========
-INSTALL(FILES README DESTINATION ${SALOME_DOCUMENTATION_GUI_INSTALL})
+INSTALL(FILES README DESTINATION ${SALOME_INSTALL_DOC_GUI})

diff --git a/index.html b/index.html
index 6b19d9ae23465c1cc99d88487e6924181563f7b6..36a3e6ed7e7f8fc483a4dae70b136a831b6074cf 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -110,6 +110,7 @@
         <h4>Compilation</h4>
         <ul>
             <li><a href="gui/KERNEL/INSTALL.html">Installation instructions</a></li>
+            <li><a href="dev/cmake/html/index.html">CMake build procedure</a></li>
         </ul>
     </td>
 

diff --git a/tui/CMakeLists.txt b/tui/CMakeLists.txt
index 263f536ebfd8b0029051ffa04ba9366407a4a53e..ca16c3b78c610a46beaf7f11156ecf2c90ebb443 100644 (file)
--- a/tui/CMakeLists.txt
+++ b/tui/CMakeLists.txt
@@ -20,4 +20,4 @@
 
 # Install rules
 # ==========
-INSTALL(FILES README DESTINATION ${SALOME_DOCUMENTATION_TUI_INSTALL})
+INSTALL(FILES README DESTINATION ${SALOME_INSTALL_DOC_TUI})