diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-12-12 16:15:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-13 14:58:08 +0100 |
| commit | 68c8693e5b451106478c0bc54aa5125f6cc2b02d (patch) | |
| tree | 490d1358ec74478e4f951056f8a67f88aaf3f8fe /coin/provisioning/common/unix/install_protobuff.sh | |
| parent | 2d6f569ee9d66ff49ab803ad9c48a954e637e1da (diff) | |
| parent | 3aef26846488f98110cb322ac6e9dda43649e993 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.
Conflicts:
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.
Removed module_config.yaml because that breaks license check in
qmake builds.
Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
Diffstat (limited to 'coin/provisioning/common/unix/install_protobuff.sh')
| -rwxr-xr-x | coin/provisioning/common/unix/install_protobuff.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index a9b2cfd0..9a1d9508 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -53,7 +53,7 @@ sudo rm "$targetFile" # devtoolset is needed when running configuration if uname -a |grep -qv "Darwin"; then - export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH" fi echo "Configuring and building protobuf" |