From 106534a628b3e9bf8d1930c6f68f295b98fa897d Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Fri, 13 Oct 2023 09:37:22 +0200 Subject: [PATCH] Change ci cmake version to Ubuntu default Some weird 3.28 preview issues with modules appeared --- .gitlab/ci/base_jobs.yml | 6 +----- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab/ci/base_jobs.yml b/.gitlab/ci/base_jobs.yml index 86aa846f..82238ae0 100644 --- a/.gitlab/ci/base_jobs.yml +++ b/.gitlab/ci/base_jobs.yml @@ -18,11 +18,7 @@ # Otherwise libglib2 needs interaction - export DEBIAN_FRONTEND=noninteractive - apt update -y - - apt install python3.11-venv libwayland-dev wayland-protocols curl wget zip unzip tar git pkg-config libxcb-* libfontconfig-dev apt-transport-https ca-certificates gnupg software-properties-common python3 python3-pip build-essential libgl1-mesa-dev mesa-common-dev lld ninja-build libxkbcommon-* libx11-dev xserver-xorg-dev xorg-dev -y - - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null - - echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal-rc main' | tee -a /etc/apt/sources.list.d/kitware.list >/dev/null - - apt update -y - - apt install cmake -y + - apt install cmake python3.11-venv libwayland-dev wayland-protocols curl wget zip unzip tar git pkg-config libxcb-* libfontconfig-dev apt-transport-https ca-certificates gnupg software-properties-common python3 python3-pip build-essential libgl1-mesa-dev mesa-common-dev lld ninja-build libxkbcommon-* libx11-dev xserver-xorg-dev xorg-dev -y - python3 -m venv env - source env/bin/activate - python3 -m pip install -U pip diff --git a/CMakeLists.txt b/CMakeLists.txt index ff38f87c..316e2588 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0) +cmake_minimum_required(VERSION 3.22.0) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) include(GetProjectVersion)