summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-10-14 13:41:21 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-10-14 14:21:26 +0200
commit96be231060829ed8c7afb2c7fd6df78d74417251 (patch)
tree29bfd1737d75e7cccc28a40d4657f7a60e1c4af6
parent2415d698e82776804bb273fb9e999dcd610ac4ff (diff)
Derive UACPP_LIBDIR from UACPP_PREFIXv5.14.0-beta2
Since we switched to relative library paths again in Qt 5.14.0 we must set UACPP_LIBDIR properly to make the -l linker options work. Change-Id: If879f19a324b82a8717aa96d0bd800dc49e40b20 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
-rw-r--r--src/opcua/configure.pri4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opcua/configure.pri b/src/opcua/configure.pri
index 39b6e2d..4c47996 100644
--- a/src/opcua/configure.pri
+++ b/src/opcua/configure.pri
@@ -5,6 +5,10 @@ defineTest(qtConfLibrary_uacpp) {
inc = $$eval(config.input.$${input}.incdir)
isEmpty(inc):!isEmpty(prefix): \
inc = $${prefix}/include
+ libdir = $$eval(config.input.$${input}.libdir)
+ isEmpty(libdir):!isEmpty(prefix): \
+ libdir = $${prefix}/lib
+ config.input.$${input}.libdir = $$libdir
!isEmpty(inc) {
config.input.$${input}.incdir += \
$$inc/uabasecpp $$inc/uaclientcpp $$inc/uastack $$inc/uapkicpp