From: NATHALIE GORE <ng13417n@dsp0897499.atlas.edf.fr>
Date: Tue, 26 Feb 2019 13:56:46 +0000 (+0100)
Subject: De la part d anthony
X-Git-Tag: V9_3_0rc2~37
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=482d8d864ca91962d284f17b01cfd8b8aa5a4d73;p=modules%2Fadao.git

De la part d anthony
---

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 3b4903c..7e2fcc6 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -29,4 +29,4 @@ set(ENV{PYTHONPATH} \${CATA_ADD_PYTHONPATH}:\$ENV{PYTHONPATH})
 EXECUTE_PROCESS(COMMAND \${PY_EXE_CATA} \${ADAO_CATA_GEN_FILE} \${OUTPUT_DIR} ADAO_Cata_V0.py)
 ENDMACRO(GENERATE_EFICAS_CATA_FOR_ADAO)" )
 
-INSTALL(CODE "GENERATE_EFICAS_CATA_FOR_ADAO( \"${PYTHON_EXECUTABLE}\" \"${CMAKE_CURRENT_SOURCE_DIR}/AdaoCatalogGenerator.py\" \"${CMAKE_INSTALL_PREFIX}/${ADAO_SCRIPT_PYTHON_SALOME}/adao\" \"${CMAKE_INSTALL_PREFIX}/${ADAO_SCRIPT_PYTHON_SALOME}:${ADAO_PYTHON_ROOT_DIR}/${ADAO_SCRIPT_PYTHON}\" )")
+INSTALL(CODE "GENERATE_EFICAS_CATA_FOR_ADAO( \"${PYTHON_EXECUTABLE}\" \"${CMAKE_CURRENT_SOURCE_DIR}/AdaoCatalogGenerator.py\" \"${CMAKE_INSTALL_PREFIX}/${ADAO_SCRIPT_PYTHON_SALOME}/adao/daEficas\" \"${CMAKE_INSTALL_PREFIX}/${ADAO_SCRIPT_PYTHON_SALOME}:${ADAO_PYTHON_ROOT_DIR}/${ADAO_SCRIPT_PYTHON}\" )")
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index a03b85f..1a46962 100644
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -30,8 +30,8 @@ file(COPY ${RST_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY resources snippets images DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 set(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees -D latex_paper_size=a4 ${CMAKE_CURRENT_BINARY_DIR} html)
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${CMAKE_CURRENT_BINARY_DIR}) # for module_version.py for conf.py for sphinx
 SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")      
-
 add_custom_target(en_tutorial_doc COMMAND ${_cmd})
 install(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target en_tutorial_doc)")
 
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
index b0654af..5e8476e 100644
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -30,8 +30,8 @@ file(COPY ${RST_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY resources snippets images DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 set(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees -D latex_paper_size=a4 ${CMAKE_CURRENT_BINARY_DIR} html)
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${CMAKE_CURRENT_BINARY_DIR}) # for module_version.py for conf.py for sphinx
 SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")      
-
 add_custom_target(fr_tutorial_doc COMMAND ${_cmd})
 install(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target fr_tutorial_doc)")