mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-09 07:39:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-ci-linux-updates' into ci-linux-updates

Browse Source
This commit is contained in:
Brad King
2021-04-06 10:49:39 -04:00
parent 8ddbb6851d c6a45968d6
commit be023ff4db
7 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_debian10_aarch64_ninja.cmake
+1
View File
@@ -59,6 +59,7 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
.gitlab/ci/configure_debian10_ninja.cmake
+1
View File
@@ -61,6 +61,7 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
.gitlab/ci/configure_fedora33_common.cmake
+1
View File
@@ -1,5 +1,6 @@
set(BUILD_CursesDialog ON CACHE BOOL "")
set(BUILD_QtDialog ON CACHE BOOL "")
set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")
.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+5
View File
@@ -19,6 +19,10 @@ apt-get install -y \
clang-6.0 \
libncurses6
# Tools needed for the test suite.
apt-get install -y \
jq
# Packages needed to test find modules.
apt-get install -y \
alsa-utils \
@@ -34,6 +38,7 @@ apt-get install -y \
libbz2-dev \
libcups2-dev \
libcurl4-gnutls-dev \
libdevil-dev \
libfontconfig1-dev \
libfreetype6-dev \
libgdal-dev \
.gitlab/ci/docker/debian10/install_deps.sh
+5
View File
@@ -19,6 +19,10 @@ apt-get install -y \
clang-6.0 \
libncurses6
# Tools needed for the test suite.
apt-get install -y \
jq
# Packages needed to test find modules.
apt-get install -y \
alsa-utils \
@@ -34,6 +38,7 @@ apt-get install -y \
libbz2-dev \
libcups2-dev \
libcurl4-gnutls-dev \
libdevil-dev \
libfontconfig1-dev \
libfreetype6-dev \
libgdal-dev \
.gitlab/ci/docker/fedora33/install_deps.sh
+2
View File
@@ -25,6 +25,7 @@ dnf install --setopt=install_weak_deps=False -y \
dnf install --setopt=install_weak_deps=False -y \
findutils \
file \
jq \
which
# Packages needed to test find modules.
@@ -34,6 +35,7 @@ dnf install --setopt=install_weak_deps=False -y \
boost-devel boost-python3-devel \
bzip2-devel \
cups-devel \
DevIL-devel \
doxygen \
expat-devel \
fontconfig-devel \
.gitlab/os-linux.yml
+3 -3
View File
@@ -45,7 +45,7 @@
### Debian
.debian10:
image: "kitware/cmake:ci-debian10-x86_64-2020-10-03"
image: "kitware/cmake:ci-debian10-x86_64-2021-04-06"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
CMake_SKIP_INSTALL: 1
.debian10_aarch64:
image: "kitware/cmake:ci-debian10-aarch64-2021-01-26"
image: "kitware/cmake:ci-debian10-aarch64-2021-04-06"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
### Fedora
.fedora33:
image: "kitware/cmake:ci-fedora33-x86_64-2020-11-13"
image: "kitware/cmake:ci-fedora33-x86_64-2021-04-06"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"