You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
qwt/qwt-5.2.2-install_qt.patch

65 lines
2.0 KiB

14 years ago
diff -up qwt-5.2.2/qwtconfig.pri.install_qt qwt-5.2.2/qwtconfig.pri
--- qwt-5.2.2/qwtconfig.pri.install_qt 2011-08-01 04:28:22.000000000 -0500
13 years ago
+++ qwt-5.2.2/qwtconfig.pri 2012-08-02 16:00:01.716286604 -0500
14 years ago
@@ -7,10 +7,14 @@ VER_MIN = 2
VER_PAT = 2
VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+CONFIG(install-qt) {
+target.path = $$[QT_INSTALL_LIBS]
+headers.path = $$[QT_INSTALL_HEADERS]/qwt
+doc.path = $$[QT_INSTALL_DOCS]
+} else {
unix {
14 years ago
INSTALLBASE = /usr/local/qwt-$$VERSION
}
14 years ago
-
win32 {
INSTALLBASE = C:/Qwt-$$VERSION
}
@@ -18,6 +22,7 @@ win32 {
target.path = $$INSTALLBASE/lib
headers.path = $$INSTALLBASE/include
doc.path = $$INSTALLBASE/doc
+}
######################################################################
# qmake internal options
14 years ago
diff -up qwt-5.2.2/src/src.pro.install_qt qwt-5.2.2/src/src.pro
--- qwt-5.2.2/src/src.pro.install_qt 2011-08-01 04:28:22.000000000 -0500
13 years ago
+++ qwt-5.2.2/src/src.pro 2012-08-02 16:00:59.965558386 -0500
@@ -219,10 +219,28 @@ contains(CONFIG, QwtWidgets) {
# Install directives
13 years ago
+# pkgconfig support
+#target.path = $$[QT_INSTALL_LIBS]
+CONFIG += create_pc create_prl no_install_prl
+QMAKE_PKGCONFIG_NAME = qwt5
+QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications
+QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
+QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/qwt
+QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+
headers.files = $$HEADERS
-doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
-unix {
- doc.files += $${QWT_ROOT}/doc/man
-}
+INSTALLS += target headers
+
+html.files = $${QWT_ROOT}/doc/html
+html.path = $$[QT_INSTALL_DOCS]/html/
+INSTALLS += html
+
+qch.files = $${QWT_ROOT}/doc/qwt-5.2.0.qch
+qch.path = $$[QT_INSTALL_DOCS]/qch
+INSTALLS += qch
+
+unix:man.files += $${QWT_ROOT}/doc/man
+unix:man.path = /usr/share
+unix:INSTALLS += man
-INSTALLS = target headers doc