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

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

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

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

diff --git a/lib/cgraph++/AGraph.h b/lib/cgraph++/AGraph.h
index 16d77343a..03eb11654 100644
--- a/lib/cgraph++/AGraph.h
+++ b/lib/cgraph++/AGraph.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <utility>
 
-#include <cgraph/cgraph.h>
+#include <cgraph.h>
 
 #ifdef GVDLL
 #if cgraph___EXPORTS // CMake's substitution of cgraph++_EXPORTS
diff --git a/lib/cgraph++/CMakeLists.txt b/lib/cgraph++/CMakeLists.txt
index 1f0b72525..de8962125 100644
--- a/lib/cgraph++/CMakeLists.txt
+++ b/lib/cgraph++/CMakeLists.txt
@@ -8,6 +8,7 @@ set_property(TARGET cgraph++ PROPERTY CXX_STANDARD_REQUIRED ON)
 target_include_directories(cgraph++ PRIVATE
   ${GRAPHVIZ_LIB_DIR}
   ${GRAPHVIZ_LIB_DIR}/cdt
+  ${GRAPHVIZ_LIB_DIR}/cgraph
   ${CMAKE_CURRENT_SOURCE_DIR}
 )