From 43d2552149eef155fe6f5626656f3760b8c75fa1 Mon Sep 17 00:00:00 2001 From: inv Date: Tue, 19 Nov 2013 17:56:16 +0000 Subject: [PATCH] Synchronize adm files --- adm/cmake/FindGraphviz.cmake | 8 ++++++-- adm/cmake/FindSalomeSphinx.cmake | 1 - adm/cmake/FindSphinx.cmake | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/adm/cmake/FindGraphviz.cmake b/adm/cmake/FindGraphviz.cmake index d9647e88c..b8bf1c029 100644 --- a/adm/cmake/FindGraphviz.cmake +++ b/adm/cmake/FindGraphviz.cmake @@ -35,19 +35,23 @@ 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 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_pathplan_LIBRARY} ) +# Don't detect cgraph on Windows +IF(NOT WIN32) + FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY NAMES cgraph PATH_SUFFIXES bin) + SET(GRAPHVIZ_LIBRARIES ${GRAPHVIZ_cgraph_LIBRARY}) +ENDIF() + # Handle the standard arguments of the find_package() command: INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Graphviz REQUIRED_VARS diff --git a/adm/cmake/FindSalomeSphinx.cmake b/adm/cmake/FindSalomeSphinx.cmake index f7d625c95..659be9199 100644 --- a/adm/cmake/FindSalomeSphinx.cmake +++ b/adm/cmake/FindSalomeSphinx.cmake @@ -30,7 +30,6 @@ SET(DOCUTILS_ROOT_DIR "$ENV{DOCUTILS_ROOT_DIR}" CACHE PATH "Path to the Docutils # Ensure the command is run with the given PYTHONPATH IF(WIN32 AND NOT CYGWIN) - MESSAGE(WARNING "Sphinx windows command not re-tested.") SET(SPHINX_EXECUTABLE ${SPHINX_EXECUTABLE}) ELSE() SET(SPHINX_EXECUTABLE /usr/bin/env PYTHONPATH="${SPHINX_PYTHONPATH}:$$PYTHONPATH" ${SPHINX_EXECUTABLE}) diff --git a/adm/cmake/FindSphinx.cmake b/adm/cmake/FindSphinx.cmake index 472156bed..9871e4dd3 100644 --- a/adm/cmake/FindSphinx.cmake +++ b/adm/cmake/FindSphinx.cmake @@ -33,8 +33,11 @@ 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") - +IF(WIN32) + SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/site-packages") +ELSE() + SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") +ENDIF() # Handle the standard arguments of the find_package() command: INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE) -- 2.30.2