diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-14 18:27:32 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2018-12-31 19:28:09 +0000 |
| commit | af2a5fab4afc630c207962ca2bf36719e0dd2fcb (patch) | |
| tree | 528dc4b727d06c3681aba6ccc55d76dfc8c219bd | |
| parent | dfe04a7197eee6cf550abcba0341f510837706b5 (diff) | |
configure: adjust to qtbase changes
the system now actually looks up libraries and headers (in as far as
declared, which is so far not the case here for headers), so any
additional paths need to be injected before forwarding to the inline
source's callback.
as a side effect, the handling of include paths is somewhat fixed -
previously, it would have added bogus paths if neither prefix nor
incdir was provided.
Fixes: QTBUG-72561
Change-Id: I2fb9c6f6b5053ea47a90e7439bbe4dca85fe1860
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| -rw-r--r-- | src/opcua/configure.pri | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/opcua/configure.pri b/src/opcua/configure.pri index d3322c2..be9a7f9 100644 --- a/src/opcua/configure.pri +++ b/src/opcua/configure.pri @@ -1,6 +1,6 @@ defineTest(qtConfLibrary_uacpp) { - !qtConfLibrary_inline($$1, $$2): \ - return(false) + input = $$eval($${2}.alias) + prefix = $$eval(config.input.$${input}.prefix) # The Windows SDK ships its dependencies and locates the libraries outside of lib win32 { @@ -9,20 +9,26 @@ defineTest(qtConfLibrary_uacpp) { return(false) } - input = $$eval($${2}.alias) - !isEmpty(config.input.$${input}.prefix) { - prefix = $$val_escape(config.input.$${input}.prefix) - - $${1}.libs += -L$${prefix}/third-party/win32/vs2015/openssl/out32dll \ - -L$${prefix}/third-party/win32/vs2015/libxml2/out32dll - export($${1}.libs) + !isEmpty(prefix) { + config.input.$${input}.libdir += \ + $${prefix}/third-party/win32/vs2015/openssl/out32dll \ + $${prefix}/third-party/win32/vs2015/libxml2/out32dll } else { qtLog("No UACPP_PREFIX specified; relying on user-provided library path.") } } - inc = $$eval($${1}.includedir) - $${1}.includedir += $$inc/uabase $$inc/uaclient $$inc/uastack $$inc/uapki - export($${1}.includedir) + inc = $$eval(config.input.$${input}.incdir) + isEmpty(inc):!isEmpty(prefix): \ + inc = $${prefix}/include + !isEmpty(inc) { + config.input.$${input}.incdir += \ + $$inc/uabase $$inc/uaclient $$inc/uastack $$inc/uapki + } else { + qtLog("No UACPP_PREFIX and no UACPP_INCDIR specified; relying on global include paths.") + } + + !qtConfLibrary_inline($$1, $$2): \ + return(false) return(true) } |