diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-22 13:28:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-22 13:32:18 (GMT) |
| commit | 585cc7c9301ff474a40d7702ce429b93f474d44f (patch) | |
| tree | 89508d9a0a083ea8b16b9cabed5992b5cb90f7f7 | |
| parent | ccd313a074657f9ebf9ae6a4c9b71587000878af (diff) | |
| download | CMake-585cc7c9301ff474a40d7702ce429b93f474d44f.zip CMake-585cc7c9301ff474a40d7702ce429b93f474d44f.tar.gz CMake-585cc7c9301ff474a40d7702ce429b93f474d44f.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.
| -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 315552b..bab4f5a 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/long file name for testing purposes" |