From: Uwe Hermann <redacted>
Date: Sat, 17 Jan 2015 20:36:19 +0000 (+0100)
Subject: Fix incorrect glibmm.h #includes.
X-Git-Tag: pulseview-0.3.0~260
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=db71cc90aa6da62b9c448a4b86c0acb7a03a26fa;p=pulseview.git

Fix incorrect glibmm.h #includes.

As per upstream docs "#include <glibmm.h>" is the correct usage,
the "glibmm-2.4" directory is handled correctly via pkg-config:

 $ pkg-config --cflags glibmm-2.4
 -I/usr/include/glibmm-2.4 [...]
---

diff --git a/pv/prop/binding/binding.hpp b/pv/prop/binding/binding.hpp
index 7d216e2d..5e9604f2 100644
--- a/pv/prop/binding/binding.hpp
+++ b/pv/prop/binding/binding.hpp
@@ -21,7 +21,7 @@
 #ifndef PULSEVIEW_PV_PROP_BINDING_BINDING_H
 #define PULSEVIEW_PV_PROP_BINDING_BINDING_H
 
-#include <glibmm-2.4/glibmm.h>
+#include <glibmm.h>
 
 #include <vector>
 #include <memory>
diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index dd6d25ba..26208258 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -21,7 +21,7 @@
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_H
 #define PULSEVIEW_PV_PROP_PROPERTY_H
 
-#include <glibmm-2.4/glibmm.h>
+#include <glibmm.h>
 
 #include <functional>
 #include <QString>