From: Maintenance team (INV) Date: Wed, 13 Jan 2016 18:08:52 +0000 (+0300) Subject: Synchronize adm files X-Git-Tag: V7_8_0a1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=17fe21865b16a0e49fd168fa41b206e3dc7f9b3f;p=tools%2Fdocumentation.git Synchronize adm files --- diff --git a/CMakeModules/FindGraphviz.cmake b/CMakeModules/FindGraphviz.cmake index af89f0c..35aada4 100644 --- a/CMakeModules/FindGraphviz.cmake +++ b/CMakeModules/FindGraphviz.cmake @@ -35,6 +35,14 @@ FIND_PROGRAM(GRAPHVIZ_EXECUTABLE dot) FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/cgraph.h) SET(GRAPHVIZ_INCLUDE_DIRS ${GRAPHVIZ_INCLUDE_DIR} ${GRAPHVIZ_INCLUDE_DIR}/graphviz) +IF(GRAPHVIZ_EXECUTABLE) + IF(NOT CMAKE_PREFIX_PATH) # Case where dot is in the path and -DGRAPHVIZ_ROOT_DIR not defined. + GET_FILENAME_COMPONENT(GRAPHVIZ_EXECUTABLE_DIR ${GRAPHVIZ_EXECUTABLE} PATH) + GET_FILENAME_COMPONENT(GRAPHVIZ_EXECUTABLE_DIR ${GRAPHVIZ_EXECUTABLE_DIR} PATH) + SET(CMAKE_PREFIX_PATH "${GRAPHVIZ_EXECUTABLE_DIR}") + ENDIF(NOT CMAKE_PREFIX_PATH) +ENDIF(GRAPHVIZ_EXECUTABLE) + FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY NAMES cdt PATH_SUFFIXES bin) FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY NAMES cgraph PATH_SUFFIXES bin) FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY NAMES gvc PATH_SUFFIXES bin)