Intersection: renaming some variables and refactor to make the algo easier to read.

[tools/medcoupling.git] / doc / tutorial / CMakeLists.txt

diff --git a/doc/tutorial/CMakeLists.txt b/doc/tutorial/CMakeLists.txt
index a598ac28ee7497974036d88837c66da50ea6c897..ecbf8d00dba656c02a6c7dd64f086b712d1efa9f 100644 (file)
--- a/doc/tutorial/CMakeLists.txt
+++ b/doc/tutorial/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,71 +17,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py)
-
-MACRO(MEDCOUPLING_EXTEND_ENVIRONMENT_VARIABLE output envvar values)
-  SET(_env)
-  FOREACH(_val ${values})
-    IF(${envvar} STREQUAL "PATH" OR ${envvar} STREQUAL "LD_LIBRARY_PATH")
-      IF(NOT IS_DIRECTORY ${_val})
-        GET_FILENAME_COMPONENT(_val "${_val}" PATH)
-      ENDIF()
-    ENDIF()
-    IF(WIN32)
-      IF(${envvar} STREQUAL "LD_LIBRARY_PATH")
-        SET(envvar PATH)
-      ENDIF()
-      STRING(REPLACE "/" "\\" _env "${_env} @SET ${envvar}=${_val};%${envvar}%\n")
-    ELSE(WIN32)
-      SET(_env "${_env} export ${envvar}=${_val}:\${${envvar}}\n")
-    ENDIF(WIN32)
-  ENDFOREACH(_val)
-  SET(${output} "${${output}} ${_env}")
-ENDMACRO(MEDCOUPLING_EXTEND_ENVIRONMENT_VARIABLE envvar values)
-
-
-SET(SETUPTOOLS_PATH $ENV{SETUPTOOLS_ROOT_DIR}/bin)
-SET(SETUPTOOLS_PYTHONPATH $ENV{SETUPTOOLS_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-
-SET(DOCUTILS_PATH $ENV{DOCUTILS_ROOT_DIR}/bin)
-SET(DOCUTILS_PYTHONPATH $ENV{DOCUTILS_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-
-SET(PKGCONFIG_PYTHONPATH $ENV{PKGCONFIG_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
-
-
-SET(build_env)
-
-#SET(_variables ${SPHINX_EXECUTABLE} ${SPHINX_APIDOC_EXECUTABLE} ${PYTHON_EXECUTABLE} ${GRAPHVIZ_EXECUTABLE} ${SETUPTOOLS_PATH} ${DOCUTILS_PATH})
-#MEDCOUPLING_EXTEND_ENVIRONMENT_VARIABLE(build_env "PATH" "${_variables}")
-
-#SET(_variables ${SPHINX_PYTHONPATH} ${PYTHON_PYTHONPATH} ${SETUPTOOLS_PYTHONPATH} ${DOCUTILS_PYTHONPATH} ${PKGCONFIG_PYTHONPATH})
-SET(_variables ${SPHINX_PYTHONPATH} ${SETUPTOOLS_PYTHONPATH} ${PKGCONFIG_PYTHONPATH} ${DOCUTILS_PYTHONPATH})
-MEDCOUPLING_EXTEND_ENVIRONMENT_VARIABLE(build_env "PYTHONPATH" "${_variables}")
-
-#SET(_variables ${PYTHON_LIBRARIES} ${GRAPHVIZ_LIBRARIES})
-SET(_variables ${PYTHON_LIBRARIES})
-MEDCOUPLING_EXTEND_ENVIRONMENT_VARIABLE(build_env "LD_LIBRARY_PATH" "${_variables}")
-
-IF(WIN32)
-  SET(_ext "bat")
-  SET(_call_cmd "call")
-ELSE()
-  SET(_ext "sh")
-  SET(_call_cmd ".")
-ENDIF()
-
+SALOME_CONFIGURE_FILE(conf.py.in conf.py)
 
 SET(_cmd_options -c ${CMAKE_CURRENT_BINARY_DIR} -b html -d doctrees -D latex_paper_size=a4 ${CMAKE_CURRENT_SOURCE_DIR} html)
-SET(_cmd ${SPHINX_EXECUTABLE} ${_cmd_options})
-
-SET(_script ${CMAKE_CURRENT_BINARY_DIR}/env_script.${_ext})
-
-FILE(WRITE ${_script} "${build_env}")
-SET(make_doc ${_call_cmd} ${_script} && ${_cmd})
-
+SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${SPHINX_EXECUTABLE}" "${_cmd_options}")      
 
-ADD_CUSTOM_TARGET(tutorial_doc COMMAND ${make_doc})
-ADD_DEPENDENCIES(usr_docs tutorial_doc)
+ADD_CUSTOM_TARGET(tutorial_doc COMMAND ${_cmd})
+ADD_DEPENDENCIES(dev_docs tutorial_doc)
 
 #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target tutorial_doc)")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${MEDCOUPLING_INSTALL_DOC}/tutorial)