diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-01-15 10:58:41 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2019-02-08 10:02:08 +0000 |
| commit | a984d3cca2defcc1f4b5e1e634f3a3e81eec14a2 (patch) | |
| tree | 7d75d2856d81285fa3e447b4397c099a5c0489e4 | |
| parent | 349fb4dd7b316517340c11c893cd138115ed5dbc (diff) | |
uacpp: Fix build on Windows
We need to include the shipped third party dependencies as well.
Change the order to not confuse the logic for uacpp includes.
Change-Id: I2910d93f30d5e010e8ef2930addc251c8a0bf50a
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| -rw-r--r-- | src/opcua/configure.pri | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/opcua/configure.pri b/src/opcua/configure.pri index cc53e43..39b6e2d 100644 --- a/src/opcua/configure.pri +++ b/src/opcua/configure.pri @@ -2,6 +2,16 @@ defineTest(qtConfLibrary_uacpp) { input = $$eval($${2}.alias) prefix = $$eval(config.input.$${input}.prefix) + inc = $$eval(config.input.$${input}.incdir) + isEmpty(inc):!isEmpty(prefix): \ + inc = $${prefix}/include + !isEmpty(inc) { + config.input.$${input}.incdir += \ + $$inc/uabasecpp $$inc/uaclientcpp $$inc/uastack $$inc/uapkicpp + } else { + qtLog("No UACPP_PREFIX and no UACPP_INCDIR specified; relying on global include paths.") + } + # The Windows SDK ships its dependencies and locates the libraries outside of lib win32 { lessThan(QMAKE_MSC_VER, 1900) { @@ -13,6 +23,9 @@ defineTest(qtConfLibrary_uacpp) { contains(QMAKE_TARGET.arch, x86_64): archdir = win64 else: archdir = win32 + config.input.$${input}.incdir += \ + $${prefix}/third-party/$${archdir}/vs2015/openssl/inc32 + config.input.$${input}.libdir += \ $${prefix}/third-party/$${archdir}/vs2015/openssl/out32dll \ $${prefix}/third-party/$${archdir}/vs2015/libxml2/out32dll @@ -21,16 +34,6 @@ defineTest(qtConfLibrary_uacpp) { } } - inc = $$eval(config.input.$${input}.incdir) - isEmpty(inc):!isEmpty(prefix): \ - inc = $${prefix}/include - !isEmpty(inc) { - config.input.$${input}.incdir += \ - $$inc/uabasecpp $$inc/uaclientcpp $$inc/uastack $$inc/uapkicpp - } else { - qtLog("No UACPP_PREFIX and no UACPP_INCDIR specified; relying on global include paths.") - } - !qtConfLibrary_inline($$1, $$2): \ return(false) return(true) |