diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-01 20:03:59 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2018-12-31 19:23:48 +0000 |
| commit | 535f71053d3ca193666d7583f1961280d50da9f5 (patch) | |
| tree | d7c38dd984a2e61f784d97188c78a02a19cf4bda | |
| parent | 490a79be5dcd94f09d85815bc400f8d5f792424b (diff) | |
configure: adjust to qbase changes
call functions to resolve/verify the determined parameters.
Change-Id: I1d0773b47e048a8b017c12216bd03625651921e4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/plugins/geometryloaders/configure.pri | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/plugins/geometryloaders/configure.pri b/src/plugins/geometryloaders/configure.pri index 316975e68..1e104f57e 100644 --- a/src/plugins/geometryloaders/configure.pri +++ b/src/plugins/geometryloaders/configure.pri @@ -1,23 +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) !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) } |