From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sun, 20 Feb 2022 09:35:39 +0000 (+0100)
Subject: gvc++: include AGraph.h without the cgraph++ directory prefix in GVLayout.h
X-Git-Tag: 3.0.0~14^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93f9bfd64eae8031c4b9995585dc390981fabe4a;p=graphviz

gvc++: include AGraph.h without the cgraph++ directory prefix in GVLayout.h

This makes it possible to use GVLayout.h from the install directory
where AGraph.h is not located under this prefix.

Towards https://gitlab.com/graphviz/graphviz/-/issues/2196.
---

diff --git a/lib/gvc++/CMakeLists.txt b/lib/gvc++/CMakeLists.txt
index 4e84ab19e..3ffe9bede 100644
--- a/lib/gvc++/CMakeLists.txt
+++ b/lib/gvc++/CMakeLists.txt
@@ -15,6 +15,7 @@ target_include_directories(gvc++ PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${GRAPHVIZ_LIB_DIR}/cdt
   ${GRAPHVIZ_LIB_DIR}/cgraph
+  ${GRAPHVIZ_LIB_DIR}/cgraph++
   ${GRAPHVIZ_LIB_DIR}/common
   ${GRAPHVIZ_LIB_DIR}/gvc
   ${GRAPHVIZ_LIB_DIR}/pathplan
diff --git a/lib/gvc++/GVLayout.h b/lib/gvc++/GVLayout.h
index defe72efe..aee993596 100644
--- a/lib/gvc++/GVLayout.h
+++ b/lib/gvc++/GVLayout.h
@@ -4,7 +4,7 @@
 
 #include "GVContext.h"
 #include "GVRenderData.h"
-#include <cgraph++/AGraph.h>
+#include <AGraph.h>
 
 #ifdef GVDLL
 #if gvc___EXPORTS // CMake's substitution of gvc++_EXPORTS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6da9e513f..dbc4ba9f2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -51,6 +51,7 @@ macro(CREATE_TEST testname)
     ${GRAPHVIZ_LIB_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/cgraph++
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/gvc
     ${GRAPHVIZ_LIB_DIR}/pathplan