Skip to content

Commit

Permalink
Use qmake PKGCONFIG instead of manual pkg-config
Browse files Browse the repository at this point in the history
  • Loading branch information
kintel committed Jan 10, 2012
1 parent 302fc66 commit eb06dbd
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -7,3 +7,5 @@ Makefile
/tmp/*
*.dSYM
*.o
*.dylib
*.so
2 changes: 1 addition & 1 deletion Magick++.pri
@@ -1,6 +1,6 @@
magick++ {
message("Configuring Magick++...")

QMAKE_CXXFLAGS += `Magick++-config --cppflags --cxxflags --ldflags --libs`
QMAKE_CXXFLAGS += `Magick++-config --cppflags --cxxflags`
QMAKE_LIBS += `Magick++-config --cppflags --cxxflags --ldflags --libs`
}
6 changes: 4 additions & 2 deletions boost.pri
Expand Up @@ -4,15 +4,17 @@ boost_thread {
macx {
LIBS += -L/opt/local/lib
}
else {
INCLUDEPATH += /usr/local/include
LIBS += -L/usr/local/lib64
}
LIBS += -lboost_thread-mt
LIBS += -lboost_iostreams-mt
LIBS += -lboost_regex-mt
LIBS += -lboost_filesystem
LIBS += -lboost_system

QMAKE_CXXFLAGS += -DBOOST_IOSTREAMS_USE_DEPRECATED
INCLUDEPATH += /usr/local/inclue
LIBS += -L/usr/local/lib64
}

boost {
Expand Down
4 changes: 1 addition & 3 deletions cairo-ps.pri
@@ -1,6 +1,4 @@
cairo-ps {
message("Configuring cairo-ps...")

QMAKE_CXXFLAGS +="`pkg-config --cflags cairo-ps`"
QMAKE_LIBS +="`pkg-config --libs cairo-ps`"
PKGCONFIG += cairo-ps
}
1 change: 1 addition & 0 deletions common.pri
Expand Up @@ -22,6 +22,7 @@ macx {
}
}

CONFIG += link_pkgconfig
include(boost.pri)
include(ghostscript.pri)
include(X11.pri)
Expand Down
3 changes: 1 addition & 2 deletions gio.pri
@@ -1,5 +1,4 @@
gio {
message("Configuring gio...")
QMAKE_CXXFLAGS +="`pkg-config --cflags gio-unix-2.0`"
QMAKE_LIBS +="`pkg-config --libs gio-unix-2.0`"
PKGCONFIG += gio-unix-2.0
}
4 changes: 1 addition & 3 deletions libxml++.pri
@@ -1,6 +1,4 @@
libxml++ {
message("Configuring libxml++...")

QMAKE_CXXFLAGS +="`pkg-config --cflags libxml++-2.6`"
QMAKE_LIBS +="`pkg-config --libs libxml++-2.6`"
PKGCONFIG += libxml++-2.6
}
4 changes: 1 addition & 3 deletions rsvg.pri
@@ -1,6 +1,4 @@
rsvg {
message("Configuring rsvg...")

QMAKE_CXXFLAGS += `pkg-config --cflags librsvg-2.0`
QMAKE_LIBS += `pkg-config --libs librsvg-2.0`
PKGCONFIG += librsvg-2.0
}

0 comments on commit eb06dbd

Please sign in to comment.