summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-08-19 18:13:19 +0200
committerSean Harmer <sean.harmer@kdab.com>2014-08-29 12:47:14 +0200
commit98de3a1ecaeeb9b97fd859e8a6a1f8dd5a843793 (patch)
tree8b9a01d3a736b4de79f95b0512baffe2e5239b17
parent672b3e47299f6ba0034f73b252d0436b55fb3085 (diff)
Use pkgconfig for bulletphysics
Change-Id: I684fe8b5abb03a44aed49819d3bad96cc11188cf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--config.tests/bullet/bullet.pro5
-rw-r--r--src/bulletphysics/bulletphysics.pro5
2 files changed, 10 insertions, 0 deletions
diff --git a/config.tests/bullet/bullet.pro b/config.tests/bullet/bullet.pro
index 9ef2dceb0..593f29f35 100644
--- a/config.tests/bullet/bullet.pro
+++ b/config.tests/bullet/bullet.pro
@@ -1,3 +1,8 @@
SOURCES += main.cpp
LIBS += -lBulletDynamics -lBulletCollision -lLinearMath
+
+unix {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += bullet
+}
diff --git a/src/bulletphysics/bulletphysics.pro b/src/bulletphysics/bulletphysics.pro
index e3fcfcb92..ceab6b281 100644
--- a/src/bulletphysics/bulletphysics.pro
+++ b/src/bulletphysics/bulletphysics.pro
@@ -12,6 +12,11 @@ load(qt_module)
include(bulletphysics.pri)
+unix {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += bullet
+}
+
gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage