diff --git a/CMakeLists.txt b/CMakeLists.txt index a7740702dd..22dbb6106e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # GNU Lesser General Public Licence (LGPL) version 3, # # copied verbatim in the file "LICENSE" # ################################################################################ -cmake_minimum_required(VERSION 3.18...3.30 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR) set(PROJECT_MIN_CXX_STANDARD 17) diff --git a/FairRoot_build_test.cmake b/FairRoot_build_test.cmake index 7c721b710c..f2477a0d39 100644 --- a/FairRoot_build_test.cmake +++ b/FairRoot_build_test.cmake @@ -30,7 +30,7 @@ ctest_start(Continuous) get_filename_component(test_install_prefix "${CTEST_BINARY_DIRECTORY}/install" ABSOLUTE) list(APPEND options - "-Werror=dev" +# "-Werror=dev" "-DDISABLE_COLOR=ON" "-DCMAKE_INSTALL_PREFIX:PATH=${test_install_prefix}" ) diff --git a/Jenkinsfile b/Jenkinsfile index 50827e26c0..8f8eb85d28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,9 @@ #!groovy def macos_builds = [ - [os: "macos", ver: "13", arch: "x86_64", compiler: "apple-clang-15", fairsoft: "24.01"], - [os: "macos", ver: "14", arch: "x86_64", compiler: "apple-clang-15", fairsoft: "24.01"], - [os: "macos", ver: "14", arch: "arm64", compiler: "apple-clang-15", fairsoft: "24.01"], + [os: "macos", ver: "14", arch: "x86_64", compiler: "apple-clang-16", fairsoft: "24.01p4"], + [os: "macos", ver: "15", arch: "x86_64", compiler: "apple-clang-16", fairsoft: "24.01p4-macos15", extra: "-DBUILD_PROOF_SUPPORT=OFF"], + [os: "macos", ver: "15", arch: "arm64", compiler: "apple-clang-16", fairsoft: "24.01p4-macos15", extra: "-DBUILD_PROOF_SUPPORT=OFF"], ] def linux_builds = [