From: akl <akl@opencascade.com>
Date: Fri, 18 Oct 2013 14:52:39 +0000 (+0000)
Subject: Correction of include path.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8cc592d3cb8427c4d2f0edbac41a324ed5855efd;p=modules%2Fyacs.git

Correction of include path.
---

diff --git a/salome_adm/cmake_files/FindGraphviz.cmake b/salome_adm/cmake_files/FindGraphviz.cmake
index 625a0f9a2..2b9e71678 100644
--- a/salome_adm/cmake_files/FindGraphviz.cmake
+++ b/salome_adm/cmake_files/FindGraphviz.cmake
@@ -32,7 +32,7 @@
 FIND_PROGRAM(GRAPHVIZ_EXECUTABLE dot)
 
 FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h)
-SET(GRAPHVIZ_INCLUDE_DIR ${GRAPHVIZ_INCLUDE_DIR}/graphviz)
+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)
@@ -56,4 +56,4 @@ INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Graphviz REQUIRED_VARS 
 					   GRAPHVIZ_EXECUTABLE 
 					   GRAPHVIZ_LIBRARIES 
-					   GRAPHVIZ_INCLUDE_DIR)
+					   GRAPHVIZ_INCLUDE_DIRS)
diff --git a/salome_adm/cmake_files/FindSalomeGraphviz.cmake b/salome_adm/cmake_files/FindSalomeGraphviz.cmake
index b6ee8aeb1..e355263b1 100644
--- a/salome_adm/cmake_files/FindSalomeGraphviz.cmake
+++ b/salome_adm/cmake_files/FindSalomeGraphviz.cmake
@@ -24,5 +24,5 @@
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Graphviz GRAPHVIZ_EXECUTABLE GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIR 2)
-MARK_AS_ADVANCED(GRAPHVIZ_EXECUTABLE GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIR)
+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)