mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-icu'

Browse Source 
7d98d464b4 ci: Enable FindICU test on Linux builds
2228e545e1 ci: Add libicu to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7199
This commit is contained in:
Brad King
2022-04-25 17:13:05 +00:00
committed by Kitware Robot
parent c6ead9be83 7d98d464b4
commit 7dc7907837
7 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/ci/configure_debian10_aarch64_ninja.cmake
View File

@@ -26,6 +26,7 @@ set(CMake_TEST_FindGSL "ON" CACHE BOOL "")
set(CMake_TEST_FindGTest "ON" CACHE BOOL "")
set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "")
set(CMake_TEST_FindIconv "ON" CACHE BOOL "")
set(CMake_TEST_FindICU "ON" CACHE BOOL "")
set(CMake_TEST_FindIntl "ON" CACHE BOOL "")
set(CMake_TEST_FindJNI "ON" CACHE BOOL "")
set(CMake_TEST_FindJPEG "ON" CACHE BOOL "")

1
.gitlab/ci/configure_debian10_ninja.cmake
View File

@@ -30,6 +30,7 @@ set(CMake_TEST_FindGSL "ON" CACHE BOOL "")
set(CMake_TEST_FindGTest "ON" CACHE BOOL "")
set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "")
set(CMake_TEST_FindIconv "ON" CACHE BOOL "")
set(CMake_TEST_FindICU "ON" CACHE BOOL "")
set(CMake_TEST_FindIntl "ON" CACHE BOOL "")
set(CMake_TEST_FindJNI "ON" CACHE BOOL "")
set(CMake_TEST_FindJPEG "ON" CACHE BOOL "")

1
.gitlab/ci/configure_fedora35_makefiles.cmake
View File

@@ -29,6 +29,7 @@ set(CMake_TEST_FindGSL "ON" CACHE BOOL "")
set(CMake_TEST_FindGTest "ON" CACHE BOOL "")
set(CMake_TEST_FindGTK2 "ON" CACHE BOOL "")
set(CMake_TEST_FindIconv "ON" CACHE BOOL "")
set(CMake_TEST_FindICU "ON" CACHE BOOL "")
set(CMake_TEST_FindIntl "ON" CACHE BOOL "")
set(CMake_TEST_FindJNI "ON" CACHE BOOL "")
set(CMake_TEST_FindJPEG "ON" CACHE BOOL "")

1
.gitlab/ci/docker/debian10-aarch64/install_deps.sh
View File

@@ -58,6 +58,7 @@ apt-get install -y \
libgsl-dev \
libgtest-dev \
libgtk2.0-dev \
libicu-dev \
libinput-dev \
libjpeg-dev \
libjsoncpp-dev \

1
.gitlab/ci/docker/debian10/install_deps.sh
View File

@@ -62,6 +62,7 @@ apt-get install -y \
libgsl-dev \
libgtest-dev \
libgtk2.0-dev \
libicu-dev \
libinput-dev \
libjpeg-dev \
libjsoncpp-dev \

1
.gitlab/ci/docker/fedora35/install_deps.sh
View File

@@ -74,6 +74,7 @@ dnf install --setopt=install_weak_deps=False -y \
lapack-devel \
libarchive-devel \
libcurl-devel \
libicu-devel \
libinput-devel systemd-devel \
libjpeg-turbo-devel \
libpng-devel \

6
.gitlab/os-linux.yml
View File

@@ -45,7 +45,7 @@
### Debian
.debian10:
image: "kitware/cmake:ci-debian10-x86_64-2022-03-16"
image: "kitware/cmake:ci-debian10-x86_64-2022-04-22"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
CMAKE_CI_NO_INSTALL: 1
.debian10_aarch64:
image: "kitware/cmake:ci-debian10-aarch64-2022-03-16"
image: "kitware/cmake:ci-debian10-aarch64-2022-04-22"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
### Fedora
.fedora35:
image: "kitware/cmake:ci-fedora35-x86_64-2022-03-16"
image: "kitware/cmake:ci-fedora35-x86_64-2022-04-22"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"