diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-23 21:03:15 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-14 15:46:35 +0000 |
| commit | 27c07d859a9704bab78b989297b2d9ce5629aeef (patch) | |
| tree | 17afce16d71ea734b3d842225a2b53e85f0ccfbb /tools | |
| parent | 825f7fe1d80583fe70c1616e1d3973cc3dc65e7b (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 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.pro | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index b6aa6f048..de0f1cdd5 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -3,14 +3,9 @@ option(host_build) SOURCES = qgltf.cpp -config_assimp:!cross_compile { - !contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG_PRIVATE += assimp - } else { - LIBS += -lassimp - } -} else { +include(../../src/3rdparty/assimp/assimp_dependency.pri) + +force_bootstrap { # Fix for using bootstrap module on OSX outside of qtbase contains(QT_CONFIG, qt_framework) { # Add framework headers directly to make bootstrap lib work @@ -18,8 +13,6 @@ config_assimp:!cross_compile { # Extend framework search path to make #include <QtCore/*> work QMAKE_CXXFLAGS += -F$$QT.core.libs } - - include(../../src/3rdparty/assimp/assimp.pri) } load(qt_tool) |