diff options
| author | Jannis Voelker <jannis.voelker@basyskom.com> | 2018-02-14 15:05:38 +0100 |
|---|---|---|
| committer | Jannis Völker <jannis.voelker@basyskom.com> | 2018-02-23 13:00:04 +0000 |
| commit | aea5ec084d64b614e6c600816aa92044fd5ed938 (patch) | |
| tree | 90f91b13ffe7b0a8512b9b2fa22a7177b3c410af | |
| parent | cca7cbb039896e2757ed7e29661f7f11ace35534 (diff) | |
Use qtConfLibrary_open62541 to locate open62541 for all platforms
QTOPCUA_OPEN62541_LIB_PATH and QTOPCUA_OPEN62541_INCLUDE_PATH
are checked first to allow overriding default locations and
pkgconfig.
Default locations and environment variables are checked second.
pkgconfig is the last option.
Change-Id: I6588558a9f43a52e1e9af91b0b4034f4dfed536e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | src/opcua/configure.json | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/opcua/configure.json b/src/opcua/configure.json index 6421ae3..163dd93 100644 --- a/src/opcua/configure.json +++ b/src/opcua/configure.json @@ -23,9 +23,14 @@ "test": "open62541", "sources": [ { - "type": "pkgConfig", - "args": "open62541", - "condition": "!config.win32" + "libs": "-lopen62541", + "condition": "!config.win32", + "type": "open62541" + }, + { + "libs": "-lopen62541 -lws2_32", + "condition": "config.win32", + "type": "open62541" }, { "libs": "-lopen62541 -lws2_32", @@ -33,8 +38,11 @@ }, { "libs": "-lopen62541", - "condition": "config.android || config.ios", - "type": "open62541" + "condition": "!config.win32" + }, + { + "type": "pkgConfig", + "args": "open62541" } ] } |