diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-12 17:03:44 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-17 10:56:43 +0000 |
| commit | b62c39f49f7dbf15df282bce2b4f5126dd68b885 (patch) | |
| tree | 59a72daa4de28efa77bf8a38243c42a641238138 /coin | |
| parent | cfd35cc49849643ce2e1b37c8bebcf0acca8f2bb (diff) | |
Increase CI test coverage by changing GCC to ICC
There is already other place in which we compile with GCC on Linux.
As we use ninja now, it has to be installed on open suse too.
Cmake port depends on system libraries therefore pcre2 needs to be
installed.
Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/platform_configs/default.yaml | 6 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1a2df74f..f5daef6d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,10 +2,10 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' +- Template: 'qtci-linux-openSUSE-15.0-x86_64' + Compiler: 'ICC_18' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index d1f3050f..9da9ed0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ set -ex -sudo zypper -nq install git gcc7 gcc7-c++ +sudo zypper -nq install git gcc7 gcc7-c++ ninja sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ --slave /usr/bin/cc cc /usr/bin/gcc-7 \ @@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \ fontconfig-devel \ sqlite3-devel \ libxkbcommon-devel \ - libxkbcommon-x11-devel + libxkbcommon-x11-devel \ + pcre2-devel libpng16-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel |