From 4df639862a7e5667b6be7ee74035ae24045f71bf Mon Sep 17 00:00:00 2001 From: inv Date: Fri, 18 Oct 2013 17:10:58 +0000 Subject: [PATCH] Synchronize adm files --- adm_local_without_kernel/cmake_files/FindGraphviz.cmake | 4 ++-- adm_local_without_kernel/cmake_files/FindSalomeGraphviz.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adm_local_without_kernel/cmake_files/FindGraphviz.cmake b/adm_local_without_kernel/cmake_files/FindGraphviz.cmake index 625a0f9a2..2b9e71678 100644 --- 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 b6ee8aeb1..e355263b1 100644 --- 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) -- 2.39.2