Merge pull request #3056 from traversaro/supportgraphviz9

yarpviz: Support compilation with graphviz >= 9
robotology · Nov 29, 2023 · cc2a18b · cc2a18b
2 parents 50cc9cd + 18e8303
commit cc2a18b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/doc/release/yarp_3_9/yarpviz_graphviz9.md b/doc/release/yarp_3_9/yarpviz_graphviz9.md
@@ -0,0 +1,3 @@
+#### `yarpviz`
+
+* Support compilation with Graphviz >= 9.
diff --git a/extern/qgv/CMakeLists.txt b/extern/qgv/CMakeLists.txt
@@ -53,6 +53,12 @@ if(Graphviz_DEFINITIONS)
   target_compile_definitions(YARP_priv_qgvcore PRIVATE ${Graphviz_DEFINITIONS})
 endif()
 
+if(Graphviz_VERSION)
+  if(Graphviz_VERSION VERSION_GREATER_EQUAL 9.0)
+    target_compile_definitions(YARP_priv_qgvcore PRIVATE GRAPHVIZ_VERSION_GE_9)
+  endif()
+endif()
+
 set_property(TARGET YARP_priv_qgvcore PROPERTY FOLDER "Libraries/External")
 
 

diff --git a/extern/qgv/qgv/QGVCore/private/QGVCore.h b/extern/qgv/qgv/QGVCore/private/QGVCore.h
@@ -93,7 +93,9 @@ class QGVCore
         rdr.len = strlen(cp);
         rdr.cur = 0;
 
+#ifndef GRAPHVIZ_VERSION_GE_9
         disc.mem = &AgMemDisc;
+#endif
         disc.id = &AgIdDisc;
         disc.io = &memIoDisc;
         g = agread (&rdr, &disc);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#### `yarpviz`

		* Support compilation with Graphviz >= 9.