From 5086ff6710d234c4e069dd9829f1b00a027ed20f Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 16 Aug 2019 18:41:58 +0300 Subject: [PATCH] Build documentation under Windows. --- doc/salome/gui/SMESH/CMakeLists.txt | 4 ++-- src/Tools/MGCleanerPlug/doc/CMakeLists.txt | 3 +-- src/Tools/Verima/Doc/CMakeLists.txt | 3 +-- src/Tools/YamsPlug/doc/CMakeLists.txt | 3 +-- src/Tools/ZCracksPlug/doc/CMakeLists.txt | 3 +-- src/Tools/blocFissure/doc/CMakeLists.txt | 3 ++- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/salome/gui/SMESH/CMakeLists.txt b/doc/salome/gui/SMESH/CMakeLists.txt index c8ec571f1..cb171e262 100644 --- 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 5e0d4830c..fa8d3661a 100644 --- 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 adaec5f24..a4a7d9642 100644 --- 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 de5589065..40cf2eff7 100644 --- 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 2311e5aaa..925380906 100644 --- 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 55003a703..d15090c19 100644 --- 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}) -- 2.39.2