brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OTHER: Redo pkg-config handling once again.

Browse source
This commit is contained in:
Thomas Frauendorfer 2008-10-17 00:25:54 +02:00
parent 11b7e5e6e7
commit 54cb2086ee
3 changed files with 14 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

28
features/pkgconfig.prf
View file

@ -1,24 +1,10 @@
defineTest(pkgconfig_exists) { # This file is intended replacement for Qt's link_pkgconfig
packages = $$1 for(PACKAGE, $$list($$unique(PKGCONFIG))) {
count(packages, 0): return(false) system(pkg-config --exists $$PACKAGE) {
CONFIG += $$PACKAGE
system(pkg-config --exists $$packages) {
return(true)
} else {
return (false)
} }
} }
defineReplace(pkgconfig_cflags) { QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG)
packages = $$1 QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG)
count(packages, 0): return(false) LIBS += $$system(pkg-config --libs $$PKGCONFIG)
return ($$system(pkg-config --cflags $$packages))
}
defineReplace(pkgconfig_libs) {
packages = $$1
count(packages, 0): return(false)
return ($$system(pkg-config --libs $$packages))
}

23
lib/lib.pro
View file

@ -1,8 +1,12 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += static CONFIG += static
include (../config.pri) include (../config.pri)
PKGCONFIG += xmms2-client-cpp
load (../features/pkgconfig.prf) load (../features/pkgconfig.prf)
!xmms2-client-cpp:error (Please install the xmms2 c++ client library)
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
@ -25,27 +29,8 @@ HEADERS += xclient.h \
xmmsqt4.h \ xmmsqt4.h \
debug.h debug.h
;RESOURCES = promoe.qrc
;macx:RC_FILE = promoe.icns
;macx:INCLUDEPATH = /sw/include
QT += network QT += network
;macx:QTPLUGIN += qjpeg
QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats
QMAKE_CXXFLAGS += -g QMAKE_CXXFLAGS += -g
;CONFIG += debug warn_on
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
XMMSCLIENTPKG += xmms2-client-cpp
pkgconfig_exists ($$XMMSCLIENTPKG) {
QMAKE_CXXFLAGS += $$pkgconfig_cflags($$XMMSCLIENTPKG)
LIBS += $$pkgconfig_libs($$XMMSCLIENTPKG)
} else {
error (Please install the xmms2 c++ client library)
}
;CONFIG += avahi

11
src/src.pro
View file

@ -1,8 +1,11 @@
TEMPLATE = app TEMPLATE = app
include (../config.pri) include (../config.pri)
PKGCONFIG += xmms2-client-cpp
load (../features/pkgconfig.prf) load (../features/pkgconfig.prf)
!xmms2-client-cpp:error (Please install the xmms2 c++ client library)
COMPONENTS+=../lib/liblib.a COMPONENTS+=../lib/liblib.a
LIBS += $$COMPONENTS LIBS += $$COMPONENTS
PRE_TARGETDEPS = $$COMPONENTS PRE_TARGETDEPS = $$COMPONENTS
@ -29,13 +32,5 @@ QMAKE_CXXFLAGS += -g
;CONFIG += debug warn_on ;CONFIG += debug warn_on
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
XMMSCLIENTPKG += xmms2-client-cpp
pkgconfig_exists ($$XMMSCLIENTPKG) {
QMAKE_CXXFLAGS += $$pkgconfig_cflags($$XMMSCLIENTPKG)
LIBS += $$pkgconfig_libs($$XMMSCLIENTPKG)
} else {
error (Please install the xmms2 c++ client library)
}
;CONFIG += avahi ;CONFIG += avahi