[gegl-qt] Build: Remove hardcoding of gegl version
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl-qt] Build: Remove hardcoding of gegl version
- Date: Wed, 16 May 2012 16:29:06 +0000 (UTC)
commit 01ddaeefb3d49758c2e2ec410c5793e7c1e5ec21
Author: Jon Nordby <jononor gmail com>
Date: Wed May 16 18:27:38 2012 +0200
Build: Remove hardcoding of gegl version
config.pri | 6 +++---
examples/common/operations.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/config.pri b/config.pri
index 3fe15aa..8b0ef35 100644
--- a/config.pri
+++ b/config.pri
@@ -52,10 +52,10 @@ isEmpty(GEGLQT_INSTALL_PREFIX) {
}
# Paths for installing files
-GEGL_LIBDIR = $$system(pkg-config --variable libdir gegl)
-GEGL_INSTALL_OPERATIONS = $$system(pkg-config --variable pluginsdir gegl)
+GEGL_LIBDIR = $$system(pkg-config --variable libdir $$GEGL_PKG)
+GEGL_INSTALL_OPERATIONS = $$system(pkg-config --variable pluginsdir $$GEGL_PKG)
isEmpty(GEGL_INSTALL_OPERATIONS) {
- GEGL_INSTALL_OPERATIONS = $$GEGL_LIBDIR/gegl-0.1/
+ GEGL_INSTALL_OPERATIONS = $$GEGL_LIBDIR/gegl-$$HAVE_GEGL/
}
### Optional deps ###
diff --git a/examples/common/operations.cpp b/examples/common/operations.cpp
index 335d7e7..61984a3 100644
--- a/examples/common/operations.cpp
+++ b/examples/common/operations.cpp
@@ -1,7 +1,7 @@
#include "operations.h"
#include <gegl.h>
-#include <gegl-0.1/gegl-plugin.h> // For GeglOperationClass
+#include <gegl-plugin.h> // For GeglOperationClass
enum ValueAttribute {
ValueMax,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]