CMake:

- Accumulate environment variables, to be used later to run some command in proper environment.

diff --git a/adm/cmake/FindGraphviz.cmake b/adm/cmake/FindGraphviz.cmake
index 2b9e716785e46f5c1e88c54f410df06a3ec0c110..6eb1e5a71767dde06bb1fcac0053cc285629a88f 100644 (file)
--- a/adm/cmake/FindGraphviz.cmake
+++ b/adm/cmake/FindGraphviz.cmake
@@ -34,21 +34,18 @@ FIND_PROGRAM(GRAPHVIZ_EXECUTABLE dot)
 FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h)
 SET(GRAPHVIZ_INCLUDE_DIRS ${GRAPHVIZ_INCLUDE_DIR} ${GRAPHVIZ_INCLUDE_DIR}/graphviz)
 
-FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY      NAMES cdt)
-FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY   NAMES cgraph)
-FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY    NAMES graph)
-FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY      NAMES gvc)
-FIND_LIBRARY(GRAPHVIZ_gvpr_LIBRARY     NAMES gvpr)
-FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan)
-FIND_LIBRARY(GRAPHVIZ_xdot_LIBRARY     NAMES xdot)
+FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY      NAMES cdt PATH_SUFFIXES bin)
+FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY   NAMES cgraph PATH_SUFFIXES bin)
+FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY    NAMES graph PATH_SUFFIXES bin)
+FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY      NAMES gvc PATH_SUFFIXES bin)
+FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan PATH_SUFFIXES bin)
+
 SET(GRAPHVIZ_LIBRARIES 
   ${GRAPHVIZ_cdt_LIBRARY}
   ${GRAPHVIZ_cgraph_LIBRARY} 
   ${GRAPHVIZ_graph_LIBRARY} 
   ${GRAPHVIZ_gvc_LIBRARY}
-  ${GRAPHVIZ_gvpr_LIBRARY}
   ${GRAPHVIZ_pathplan_LIBRARY}
-  ${GRAPHVIZ_xdot_LIBRARY}
   )
 
 # Handle the standard arguments of the find_package() command:

diff --git a/adm/cmake/FindSalomeExpat.cmake b/adm/cmake/FindSalomeExpat.cmake
index 0a99950e09efb0d824d7e53926ad5724722d13aa..a37a6f567b96e629c4d562b3e173a0eadd934161 100644 (file)
--- a/adm/cmake/FindSalomeExpat.cmake
+++ b/adm/cmake/FindSalomeExpat.cmake
@@ -27,4 +27,7 @@ MARK_AS_ADVANCED(EXPAT_LIBRARIES EXPAT_INCLUDE_DIR)
 #  MESSAGE(STATUS "EXPAT include dir is: ${EXPAT_INCLUDE_DIR}")
 #ENDIF()
 
-SALOME_ACCUMULATE_HEADERS(EXPAT_INCLUDE_DIR)
+IF(Expat_FOUND OR EXPAT_FOUND)
+  SALOME_ACCUMULATE_HEADERS(EXPAT_INCLUDE_DIR)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${EXPAT_LIBRARIES})
+ENDIF()

diff --git a/adm/cmake/FindSalomeGraphviz.cmake b/adm/cmake/FindSalomeGraphviz.cmake
index e355263b1b229ab371959decd9954b8843e88c3a..ad3c3c4991e780b02f82caef53ec54d7170d8996 100644 (file)
--- a/adm/cmake/FindSalomeGraphviz.cmake
+++ b/adm/cmake/FindSalomeGraphviz.cmake
@@ -26,3 +26,8 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Graphviz GRAPHVIZ_EXECUTABLE GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIRS 2)
 MARK_AS_ADVANCED(GRAPHVIZ_EXECUTABLE GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIRS)
+
+IF(GRAPHVIZ_FOUND)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${GRAPHVIZ_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${GRAPHVIZ_LIBRARIES})
+ENDIF()
\ No newline at end of file

diff --git a/adm/cmake/FindSalomeQScintilla.cmake b/adm/cmake/FindSalomeQScintilla.cmake
index 8a438b20df2ef2a55bd3392d9b19559665e221dc..f0633105f0cc78998fb80d2749518450fceae37e 100644 (file)
--- a/adm/cmake/FindSalomeQScintilla.cmake
+++ b/adm/cmake/FindSalomeQScintilla.cmake
@@ -26,4 +26,7 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(QScintilla QSCINTILLA_ROOT_DIR 0)
 #    MESSAGE(STATUS "QScintilla include dir is: ${QSCINTILLA_INCLUDE_DIRS}")
 # ENDIF()   
 
-SALOME_ACCUMULATE_HEADERS(QSCINTILLA_INCLUDE_DIRS)
\ No newline at end of file
+IF(QSCINTILLA_FOUND)
+  SALOME_ACCUMULATE_HEADERS(QSCINTILLA_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${QSCINTILLA_LIBRARIES})
+ENDIF()
\ No newline at end of file

diff --git a/adm/cmake/FindSalomeSphinx.cmake b/adm/cmake/FindSalomeSphinx.cmake
index 2d26445a94049cc50a1be995b63b97d1a18ea949..f7d625c95acae7d07e558099536c25344d3deb3f 100644 (file)
--- a/adm/cmake/FindSalomeSphinx.cmake
+++ b/adm/cmake/FindSalomeSphinx.cmake
@@ -21,19 +21,12 @@
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
-# The caller of this macro might set SPHINX_PYTHONPATH to provide a path to be added in front 
-# of the PYTHONPATH with which the sphinx command should be ran.
-#
-# Note the environment is also overriden in 
-#     doc/docutils/CMakeLists.txt
-# with the creation of a dedicated launcher script.
-#
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Sphinx SPHINX_EXECUTABLE 2)
 
 # Also retrieve paths to DOCUTILS and SETUPTOOLS:
 SET(SETUPTOOLS_ROOT_DIR "$ENV{SETUPTOOLS_ROOT_DIR}" CACHE PATH "Path to the Setuptools installation")
-SET(DOCUTILS_ROOT_DIR "$ENV{DOCUTILS_ROOT_DIR}" CACHE PATH "Path to the Setuptools installation")
+SET(DOCUTILS_ROOT_DIR "$ENV{DOCUTILS_ROOT_DIR}" CACHE PATH "Path to the Docutils installation")
 
 # Ensure the command is run with the given PYTHONPATH
 IF(WIN32 AND NOT CYGWIN)
@@ -44,3 +37,8 @@ ELSE()
 ENDIF()
 
 MARK_AS_ADVANCED(SPHINX_EXECUTABLE)
+
+IF(SPHINX_FOUND)
+  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SPHINX_EXECUTABLE})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SPHINX_PYTHONPATH})
+ENDIF()

diff --git a/adm/cmake/FindSphinx.cmake b/adm/cmake/FindSphinx.cmake
index 8e05c7a73c21330b913c249bb7405651e6ffd72c..472156bed6565d5571936a60cd2b213f86eac2cf 100644 (file)
--- a/adm/cmake/FindSphinx.cmake
+++ b/adm/cmake/FindSphinx.cmake
@@ -1,11 +1,9 @@
 # - Sphinx detection
 #
-# Output variable: SPHINX_EXECUTABLE
-#                  
+# Output variables:
+#   SPHINX_EXECUTABLE - path to the Sphinx executable
+#   SPHINX_PYTHONPATH - path to the Sphinx Python modules                 
 # 
-# The executable 'sphinx-build' is looked for and returned in the above variable.
-#
-
 ###########################################################################
 # Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
@@ -30,7 +28,12 @@
 #
 ###########################################################################
 
-FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build)
+FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build PATH_SUFFIXES Scripts)
+
+# Get root dir locally, going up two levels from the exec:
+GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${SPHINX_EXECUTABLE}" PATH)
+GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
+SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
 
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)