From 91033a3a1fa384f70a08351b3b3c7ff6a93567e2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 22 Nov 2013 09:48:02 +0000 Subject: [PATCH] From Kristofer Tingdahl, Build fix for svg plugin that makes sure the version of librsvg is at sufficient, and fixed a missing virtual destructor warning. --- CMakeModules/FindRSVG.cmake | 4 +++- include/osg/ValueObject | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeModules/FindRSVG.cmake b/CMakeModules/FindRSVG.cmake index cae658648..8d219ff21 100644 --- a/CMakeModules/FindRSVG.cmake +++ b/CMakeModules/FindRSVG.cmake @@ -5,7 +5,9 @@ IF(PKG_CONFIG_FOUND) INCLUDE(FindPkgConfig) - PKG_CHECK_MODULES(RSVG librsvg-2.0) + #Version 2.35 introduces the rsvg_cleanup function which is used + PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35) + PKG_CHECK_MODULES(CAIRO cairo) IF (RSVG_FOUND AND NOT CAIRO_FOUND) diff --git a/include/osg/ValueObject b/include/osg/ValueObject index d6ec0bd39..ed8ff2df2 100644 --- a/include/osg/ValueObject +++ b/include/osg/ValueObject @@ -44,6 +44,7 @@ class ValueObject : public Object class GetValueVisitor { public: + virtual ~GetValueVisitor() {} virtual void apply(bool /*value*/) {} virtual void apply(char /*value*/) {} virtual void apply(unsigned char /*value*/) {} @@ -69,6 +70,7 @@ class ValueObject : public Object class SetValueVisitor { public: + virtual ~SetValueVisitor() {} virtual void apply(bool& /*value*/) {} virtual void apply(char& /*value*/) {} virtual void apply(unsigned char& /*value*/) {}