summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-11-23 21:03:15 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-14 15:46:35 +0000
commit27c07d859a9704bab78b989297b2d9ce5629aeef (patch)
tree17afce16d71ea734b3d842225a2b53e85f0ccfbb /src/3rdparty
parent825f7fe1d80583fe70c1616e1d3973cc3dc65e7b (diff)
centralize + fix use of system assimp
follow the foo.pri & foo_dependency.pri pattern found in qtbase to de-duplicate the code (and thus implicitly make it consistent) and synchronize the conditionals in the configure test. also document why we still can't enable the assimp sceneparser in all configurations. Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/assimp/assimp_dependency.pri11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
new file mode 100644
index 000000000..4fe0df54e
--- /dev/null
+++ b/src/3rdparty/assimp/assimp_dependency.pri
@@ -0,0 +1,11 @@
+config_assimp:!if(cross_compile:host_build) {
+ unix:!contains(QT_CONFIG, no-pkg-config) {
+ CONFIG += link_pkgconfig
+ PKGCONFIG_PRIVATE += assimp
+ } else {
+ LIBS += -lassimp
+ }
+ return()
+} else {
+ include(assimp.pri)
+}