Synchronize adm files

diff --git a/adm_local_without_kernel/cmake_files/FindGraphviz.cmake b/adm_local_without_kernel/cmake_files/FindGraphviz.cmake
index 625a0f9a29874614d797189234dd8c9c783fb4aa..2b9e716785e46f5c1e88c54f410df06a3ec0c110 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindGraphviz.cmake
+++ b/adm_local_without_kernel/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/adm_local_without_kernel/cmake_files/FindSalomeGraphviz.cmake b/adm_local_without_kernel/cmake_files/FindSalomeGraphviz.cmake
index b6ee8aeb18f1bf46d5104e732c6aea838258d068..e355263b1b229ab371959decd9954b8843e88c3a 100644 (file)
--- a/adm_local_without_kernel/cmake_files/FindSalomeGraphviz.cmake
+++ b/adm_local_without_kernel/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)