diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-03-06 15:03:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-08 19:27:06 +0000 |
| commit | 7a052f4183a2a115fc1246daa20b53fbd9109c9b (patch) | |
| tree | 15e9aa52e75eba96140de44596e2da96ef9585fa | |
| parent | 984b15d75804137276391dbf826c03a3734ba2a7 (diff) | |
open62541: Fix provisioning for RHEL 7.4
RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.
Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| -rwxr-xr-x | coin/provisioning/common/linux/open62541.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index 878bfe0d..4d907f17 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -44,6 +44,8 @@ fi set -ex +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" trap "sudo rm -fr $TEMPDIR" EXIT cd $TEMPDIR @@ -56,8 +58,12 @@ cd open62541 git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629 mkdir build cd build -cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 .. make sudo make install sudo /sbin/ldconfig + +SetEnvVar "QTOPCUA_OPEN62541_LIB_PATH" "/usr/local/lib/open62541" +SetEnvVar "QTOPCUA_OPEN62541_INCLUDE_PATH" "/usr/local/include/open62541" + |