diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-22 13:28:08 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-11-13 13:37:03 (GMT) |
| commit | ada31706253c3953f48f86d571e5255cb4556113 (patch) | |
| tree | b7f27781ae57bcfb3f3c2c9150598008638f95b8 | |
| parent | 86f196f63410f144328acaff80ece2b750f8b8a1 (diff) | |
| download | CMake-ada31706253c3953f48f86d571e5255cb4556113.zip CMake-ada31706253c3953f48f86d571e5255cb4556113.tar.gz CMake-ada31706253c3953f48f86d571e5255cb4556113.tar.bz2 | |
ci: install gmock in the Fedora 31 image
The gmock libraries are referenced by GTest's CMake package files.
While at it, also explicitly install gettext. It is installed already,
but make it explicit for future testing of the FindGettext module.
(cherry picked from commit 585cc7c9301ff474a40d7702ce429b93f474d44f)
| -rwxr-xr-x | .gitlab/ci/docker/fedora31/install_deps.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index fa57f61..c1391e3 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -39,8 +39,10 @@ dnf install --setopt=install_weak_deps=False -y \ fontconfig-devel \ freetype-devel \ gdal-devel \ + gettext \ giflib-devel \ glew-devel \ + gmock \ gnutls-devel \ gsl-devel \ gtest-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 9438676..4e8fb80 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -49,7 +49,7 @@ ### Fedora .fedora31: - image: "kitware/cmake:ci-fedora31-x86_64-2020-10-20" + image: "kitware/cmake:ci-fedora31-x86_64-2020-10-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |