Synchronize adm files

diff --git a/CMakeModules/FindGraphviz.cmake b/CMakeModules/FindGraphviz.cmake
index ecae91f0ac8fa94e2b0280fc2972e7eee5df1b7c..5457f7a66fbc3c602d9d94aa7ddd930f1b9f42ef 100644 (file)
--- a/CMakeModules/FindGraphviz.cmake
+++ b/CMakeModules/FindGraphviz.cmake
@@ -3,7 +3,9 @@
 # Output variables: GRAPHVIZ_EXECUTABLE   - where is executable 'dot' takes place.
 #                  GRAPHVIZ_INCLUDE_DIRS - where to find headers.
 #                  GRAPHVIZ_LIBRARIES    - where to get libraries.
-#                  GRAPHVIZ_FOUND        - True if Graphiz was found.
+#                  GRAPHVIZ_VERSION      - Graphviz version
+#                  GRAPHVIZ_DEFINITIONS  - Graphviz definitions
+#                  GRAPHVIZ_FOUND        - True if Graphviz was found.
 #
 ###########################################################################
 # Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
@@ -30,11 +32,11 @@
 
 FIND_PROGRAM(GRAPHVIZ_EXECUTABLE dot)
 
-FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h)
+FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/cgraph.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_graph_LIBRARY    NAMES graph PATH_SUFFIXES bin)
+FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY    NAMES cgraph PATH_SUFFIXES bin)
 FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY      NAMES gvc PATH_SUFFIXES bin)
 FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan PATH_SUFFIXES bin)
 
@@ -45,6 +47,16 @@ SET(GRAPHVIZ_LIBRARIES
   ${GRAPHVIZ_pathplan_LIBRARY}
   )
 
+IF(GRAPHVIZ_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${GRAPHVIZ_EXECUTABLE} "-V" ERROR_VARIABLE GRAPHVIZ_VERSION ERROR_STRIP_TRAILING_WHITESPACE)
+  STRING(REGEX REPLACE ".* ([0-9.]+) .*" "\\1" GRAPHVIZ_VERSION "${GRAPHVIZ_VERSION}")
+ENDIF()
+
+SET(GRAPHVIZ_DEFINITIONS)
+IF("${GRAPHVIZ_VERSION}" VERSION_LESS "2.36.0")
+  SET(GRAPHVIZ_DEFINITIONS -DWITH_CGRAPH)
+ENDIF()
+
 ## Don't detect cgraph on Windows
 #IF(NOT WIN32)
 #  FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY   NAMES cgraph PATH_SUFFIXES bin)