[gegl-qt] Build: Don't put QtDeclarative in .pc file when built without
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl-qt] Build: Don't put QtDeclarative in .pc file when built without
- Date: Tue, 27 Sep 2011 22:34:14 +0000 (UTC)
commit a4b491a8a710493476e34d809658c233b1420628
Author: Jon Nordby <jononor gmail com>
Date: Wed Sep 28 00:23:31 2011 +0200
Build: Don't put QtDeclarative in .pc file when built without
config.pri | 2 ++
gegl-qt/gegl-qt4-0.1.pc.in | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/config.pri b/config.pri
index ed395c5..a0519ce 100644
--- a/config.pri
+++ b/config.pri
@@ -71,6 +71,7 @@ contains(HAVE_QT_DECLARATIVE, yes) {
# Need to be conditionally included in python binding generation
GEGLQT_DECLARATIVE_INCLUDE = "$$LITERAL_HASH\\include <GeglQtDeclarative>"
GEGLQT_DECLARATIVE_TYPESYSTEM = "<object-type name=\\\"NodeViewDeclarativeItem\\\"/>"
+ GEGLQT_DECLARATIVE_PKGCONFIG = "QtDeclarative"
}
# Variables that can be substituted in .in files
@@ -86,6 +87,7 @@ SUBST_VARIABLES += \
GEGLQT_INSTALL_DATA \
GEGLQT_DECLARATIVE_INCLUDE \
GEGLQT_DECLARATIVE_TYPESYSTEM \
+ GEGLQT_DECLARATIVE_PKGCONFIG \
GEGLQT_PROJECTBRIEF \
GEGLQT_PROJECTNAME \
diff --git a/gegl-qt/gegl-qt4-0.1.pc.in b/gegl-qt/gegl-qt4-0.1.pc.in
index 6252290..a663f55 100644
--- a/gegl-qt/gegl-qt4-0.1.pc.in
+++ b/gegl-qt/gegl-qt4-0.1.pc.in
@@ -6,7 +6,7 @@ includedir= GEGLQT_INSTALL_HEADERS@
Name: GEGL-QT
Description: Convenience library for using Gegl in Qt applications
Version: @GEGLQT_VERSION@
-Requires: gegl QtDeclarative QtGui
+Requires: gegl @GEGLQT_DECLARATIVE_PKGCONFIG@ QtGui
Cflags: -I${includedir}/@GEGLQT_LIBNAME@
Libs: -L${libdir} -l GEGLQT_LIBNAME@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]