diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df1901c362153c9ed2d6794d394e9a847e0fd37e..1ca751b90e150d39ea6fb22b2f95eaabeb49309b 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 218866adba40375f5672908bd29d807155b15842..c394b40b38f351ef5504e11f63ba97ce91a17ce6 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