Build documentation under Windows.

diff --git a/doc/salome/gui/SMESH/CMakeLists.txt b/doc/salome/gui/SMESH/CMakeLists.txt
index c8ec571f1d975b1d5f74d9e0c67eeb3553ef9c95..cb171e26292eeb61bee870e7bdf6de554d3e9938 100644 (file)
--- a/doc/salome/gui/SMESH/CMakeLists.txt
+++ b/doc/salome/gui/SMESH/CMakeLists.txt
@@ -45,11 +45,11 @@ ENDIF()
 
 # 1. Options for generating temporary python modules
 SET(_cmd_tmp_gen_options ${smesh_file} -o tmp1/smeshBuilder_dynamic.py -f sphinx StdMeshers)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd_tmp_gen env_script "${PYTHON_EXECUTABLE}" "${_cmd_tmp_gen_options}")
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd_tmp_gen env_script "${PYTHON_EXECUTABLE}" "${_cmd_tmp_gen_options}" CONTEXT "SMESH_DOC")
 
 # 2. Options for generating final smeshBuilder.py script
 SET(_cmd_smeshBuilder_gen_options ${smesh_merge_file} -o tmp2/smeshBuilder.py smeshBuilder)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd_smeshBuilder_gen env_script "${PYTHON_EXECUTABLE}" "${_cmd_smeshBuilder_gen_options}")
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd_smeshBuilder_gen env_script "${PYTHON_EXECUTABLE}" "${_cmd_smeshBuilder_gen_options}" CONTEXT "SMESH_DOC")
 
 ADD_CUSTOM_TARGET(pre_usr_docs
   # 1. Make temporary directories for python modules 

diff --git a/src/Tools/MGCleanerPlug/doc/CMakeLists.txt b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
index 5e0d4830cc5247013b4fc4ed72905aab2797e083..fa8d3661ac1869871b96b12cd2acc273315b6299 100644 (file)
--- a/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
+++ b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt
@@ -20,8 +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)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
-
+SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
 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 adaec5f24e5069314c7ce5c76722b64035606f65..a4a7d96427c2243843e0189c08851cbf550bda34 100644 (file)
--- a/src/Tools/Verima/Doc/CMakeLists.txt
+++ b/src/Tools/Verima/Doc/CMakeLists.txt
@@ -20,8 +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)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
-
+SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
 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 de55890651a611b8ba50b23bcddf5717e5d0025a..40cf2eff70cce3f5978ef589bd536d38c33279b0 100644 (file)
--- a/src/Tools/YamsPlug/doc/CMakeLists.txt
+++ b/src/Tools/YamsPlug/doc/CMakeLists.txt
@@ -20,8 +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)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
-
+SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")  
 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 2311e5aaa32582c36ab3c02afaafa7be4bc067e5..925380906f9418fbcd79524193590bea4d8c1cb2 100644 (file)
--- a/src/Tools/ZCracksPlug/doc/CMakeLists.txt
+++ b/src/Tools/ZCracksPlug/doc/CMakeLists.txt
@@ -20,8 +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)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
-
+SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")
 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 55003a7037124bc3f4b8b79fab7a1cb69355113d..d15090c19ff0a8fa95d21903e122dd7bf5fd664f 100644 (file)
--- a/src/Tools/blocFissure/doc/CMakeLists.txt
+++ b/src/Tools/blocFissure/doc/CMakeLists.txt
@@ -20,7 +20,8 @@
 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)
-SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
+
+SET(_cmd "${SPHINX_EXECUTABLE}" "${_cmd_options}")            
 
 ADD_CUSTOM_TARGET(html_docs_blocFissure COMMAND ${_cmd})