aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2018-06-28 13:59:03 +0200
committerLiang Qi <liang.qi@qt.io>2018-07-04 12:03:37 +0000
commit4869ad6a49de690a532e637a3939eb56068a8646 (patch)
tree4f8db00b9bcf6669114815ac50aba15bc26fc72c
parent7c14e7a5cc25f4c09ec916429835c04018af197f (diff)
Provisioning: Update Open62541 install path
Use the updated install path for OPEN62541_PREFIX argument in CI. Change-Id: Ifa06d002516da20001a94ff6e7066504fa471a8f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rwxr-xr-xcoin/provisioning/common/linux/open62541.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh
index 97a76886..dfa4ee02 100755
--- a/coin/provisioning/common/linux/open62541.sh
+++ b/coin/provisioning/common/linux/open62541.sh
@@ -62,12 +62,12 @@ cd open62541
git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7
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/open62541 ..
+TARGETPATH=/opt/open62541
+cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
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"
+SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"