diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-01 03:00:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-01 03:00:22 +0100 |
| commit | 6f59eb1990d2ad700a109c6407aaef28004e135b (patch) | |
| tree | e4c8bf92b293e1b627c5d38ec3aa595a3e030f55 /src | |
| parent | 59c18801b129ee81487ebd842641cecd0ce18508 (diff) | |
| parent | 535f71053d3ca193666d7583f1961280d50da9f5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I1acb096a3f3bdadd59c5e834b1260a53f76fc7cd
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/geometryloaders/configure.pri | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/plugins/geometryloaders/configure.pri b/src/plugins/geometryloaders/configure.pri index c49c1be51..1e104f57e 100644 --- a/src/plugins/geometryloaders/configure.pri +++ b/src/plugins/geometryloaders/configure.pri @@ -1,29 +1,19 @@ defineTest(qtConfLibrary_fbx) { - libs = $$eval($${1}.libs) - includedir = - - libs_override = $$getenv(FBXSDK_LIBS) - !isEmpty(libs_override) { - libs = $${libs_override} - } + libdir = prefix = $$getenv(FBXSDK) - - unix:isEmpty(prefix) { - libs += "-L/usr/local/lib" - libs += "-L/usr/lib" - } - !isEmpty(prefix) { - includedir += $${prefix}/include - !win32:libs += -L$${prefix}/lib + !qtConfResolvePathIncs($${1}.includedir, $${prefix}/include, $$2): \ + return(false) + !win32: libdir += $${prefix}/lib } - $${1}.libs = $$val_escape(libs) - $${1}.includedir = $$val_escape(includedir) + libs = $$getenv(FBXSDK_LIBS) + isEmpty(libs): \ + libs = $$eval($${1}.libs) - export($${1}.libs) - export($${1}.includedir) + !qtConfResolvePathLibs($${1}.libs, $$libdir, $$libs): \ + return(false) return(true) } |