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 4e84ab19e1081905ac7e3971d2a1d5c1ffeb7737..3ffe9bede7f2fc87c2805759453a7d0d8cbd0143 100644 (file)
--- 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 defe72efee1b3ef5b44fb6734f759d8acdc215c0..aee99359609ecead119257f0d00bdbf6a8b89c83 100644 (file)
--- 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 6da9e513f55d9940b49bd85bea4b839c1f7f156e..dbc4ba9f2c9ca01d2b2a111e060a9c264b54fbd4 100644 (file)
--- 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