From: vsr <vsr@opencascade.com>
Date: Fri, 10 Oct 2014 06:15:43 +0000 (+0400)
Subject: Detect version of graphviz, to set preprocessor definitions properly; for backward... 
X-Git-Tag: V7_5_0a1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9597be6824b4faffc96c8d13e60c90563b7b45ff;p=modules%2Fkernel.git

Detect version of graphviz, to set preprocessor definitions properly; for backward compatibility with graphviz < 2.36.
---

diff --git a/salome_adm/cmake_files/FindGraphviz.cmake b/salome_adm/cmake_files/FindGraphviz.cmake
index bc652bc8a..5457f7a66 100644
--- a/salome_adm/cmake_files/FindGraphviz.cmake
+++ b/salome_adm/cmake_files/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
@@ -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)