summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2015-11-05 15:01:51 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2015-11-05 18:14:51 +0000
commit537dc6222a5da789153e7c32953d3d7a5ca11980 (patch)
tree0e7f0769fbf8358b6d592d071242716dded4498b
parentce630c2e1daac2197d6488a4f5c2b46474bbe566 (diff)
Prefer to build qgltf with the system libassimp
This is a host tool, so we can't use the system library from the target system when cross-compliing. Otherwise build with the system library when it's available. Change-Id: Id78ba938bda578dc891e2931ced5cf710b0ab7ce Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--tools/qgltf/qgltf.pro11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro
index 54bf22a34..5fcebbae5 100644
--- a/tools/qgltf/qgltf.pro
+++ b/tools/qgltf/qgltf.pro
@@ -3,4 +3,13 @@ load(qt_tool)
SOURCES = $$PWD/qgltf.cpp
-include(../../src/3rdparty/assimp/assimp.pri)
+config_assimp:!cross_compile {
+ !contains(QT_CONFIG, no-pkg-config) {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += assimp
+ } else {
+ LIBS += -lassimp
+ }
+} else {
+ include(../../src/3rdparty/assimp/assimp.pri)
+}