From c239b019e9330d4b6f34609a063b01d879de54ad Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Fri, 10 Jun 2022 16:33:54 +0200 Subject: [PATCH] Fix Continuous Integration The external flesnet requires at least CMake 3.14.0. Check already in our CMakeLists.txt if this version is available, otherwise the test is done when building flesnet and the error is hidden in some log file. Use CMake from the FairSoft installation on the CI runner (lxir116 )where the CMake version is to old. --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df1901c362..1ca751b90e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,7 +248,7 @@ FileLicenceCheck: BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10" SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" - + EXTRA_PATH: "${SIMPATH}/bin" .macosx_tag: &macosx_tag stage: build diff --git a/CMakeLists.txt b/CMakeLists.txt index 218866adba..c394b40b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ # Check if cmake has the required version # For the CTest fixtures at least CMake 3.7.2 is needed. -# Since NicaFempto requires 3.11.0 we should be consistent while we +# Since flesnet requires 3.14.0 we should be consistent while we # build it in the CbmRoot context -CMAKE_MINIMUM_REQUIRED(VERSION 3.11.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14) # Set name of our project to "CBMROOT". Has to be done # after check of cmake version -- GitLab