Build documentation under Windows: revert previous wrong commit, apply new approach.

diff --git a/src/Tools/MGCleanerPlug/doc/CMakeLists.txt b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
index fa8d3661ac1869871b96b12cd2acc273315b6299..75bb6168880c8ee9ff35e224b4a143cb335af8bb 100644 (file)
--- a/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
+++ b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
@@ -20,7 +20,7 @@
 SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees ${CMAKE_CURRENT_SOURCE_DIR} docutils)
-SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}" CONTEXT MGCleanerPlug_DOC)
 ADD_CUSTOM_TARGET(html_docs_MGCleanerPlug COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_MGCleanerPlug)")

diff --git a/src/Tools/Verima/Doc/CMakeLists.txt b/src/Tools/Verima/Doc/CMakeLists.txt
index a4a7d96427c2243843e0189c08851cbf550bda34..33455462d5089029990b09e06630eb6f1f0422bd 100644 (file)
--- a/src/Tools/Verima/Doc/CMakeLists.txt
+++ b/src/Tools/Verima/Doc/CMakeLists.txt
@@ -20,7 +20,7 @@
 SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees ${CMAKE_CURRENT_SOURCE_DIR} docutils)
-SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}" CONTEXT Verima_DOC)
 ADD_CUSTOM_TARGET(html_docs_Verima COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_Verima)")

diff --git a/src/Tools/YamsPlug/doc/CMakeLists.txt b/src/Tools/YamsPlug/doc/CMakeLists.txt
index 40cf2eff70cce3f5978ef589bd536d38c33279b0..480b6af8c786db730e2516059c50f4b84ab4f22b 100644 (file)
--- a/src/Tools/YamsPlug/doc/CMakeLists.txt
+++ b/src/Tools/YamsPlug/doc/CMakeLists.txt
@@ -20,7 +20,7 @@
 SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees ${CMAKE_CURRENT_SOURCE_DIR} docutils)
-SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")  
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}" CONTEXT YamsPlug_DOC)
 ADD_CUSTOM_TARGET(html_docs_YamsPlug COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_YamsPlug)")

diff --git a/src/Tools/ZCracksPlug/doc/CMakeLists.txt b/src/Tools/ZCracksPlug/doc/CMakeLists.txt
index 925380906f9418fbcd79524193590bea4d8c1cb2..a6359ae06a24c62470703b424f321814b5ffbdd4 100644 (file)
--- a/src/Tools/ZCracksPlug/doc/CMakeLists.txt
+++ b/src/Tools/ZCracksPlug/doc/CMakeLists.txt
@@ -20,7 +20,7 @@
 SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees ${CMAKE_CURRENT_SOURCE_DIR} docutils)
-SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}" CONTEXT ZCracksPlug_DOC)
 ADD_CUSTOM_TARGET(html_docs_ZCracksPlug COMMAND ${_cmd})
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_ZCracksPlug)")

diff --git a/src/Tools/blocFissure/doc/CMakeLists.txt b/src/Tools/blocFissure/doc/CMakeLists.txt
index d15090c19ff0a8fa95d21903e122dd7bf5fd664f..87e7d909bebca5e8a014796dfbb124626a5a26a7 100644 (file)
--- a/src/Tools/blocFissure/doc/CMakeLists.txt
+++ b/src/Tools/blocFissure/doc/CMakeLists.txt
@@ -21,7 +21,7 @@ SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees ${CMAKE_CURRENT_SOURCE_DIR} docutils)
 
-SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}" CONTEXT blocFissure_DOC)
 
 ADD_CUSTOM_TARGET(html_docs_blocFissure COMMAND ${_cmd})