Skip to content

Bump up version requirement for CMake #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anderkve wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump up version requirement for CMake #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fb2f70
Changed cmake version requirement to 3.16.3 (matching Ubuntu 20.04 LTS)
anderkve Nov 14, 2023
7debff4
Updated cmake version req. in README
anderkve Nov 14, 2023
aab3bd7
Deleted FindSQLite3.cmake (now a default module in CMake)
anderkve Nov 14, 2023
c53d991
For debugging: Print cmake version in CI build tests.
anderkve Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
- name: Configure with cmake
run: |
cd BUILD/ && . buildenv.sh
cmake --version
cmake .. -D WITH_ROOT=OFF -D WITH_RESTFRAMES=OFF -D WITH_HEPMC=ON -D WITH_YODA=ON -D BUILD_FS_MODELS="CMSSM;MSSM;MDM" -D WITH_MPI=OFF
- name: Build scanners
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci_Mac_arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
run: |
echo "Configure with cmake"
cd BUILD
cmake --version
cmake -DWITH_MPI=ON -DWITH_HEPMC=ON -DWITH_YODA=ON -DBUILD_FS_MODELS="CMSSM;MSSM;MDM" -Ditch="micromegas_DMsimpVectorMedVectorDM" ..
- name: Build scanners
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci_Mac_x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
run: |
echo "Configure with cmake"
cd BUILD
cmake --version
# Ditching a few backends that don't currently work on Mac
cmake -DWITH_MPI=ON -DWITH_HEPMC=ON -DWITH_YODA=ON -DBUILD_FS_MODELS="CMSSM;MSSM;MDM" -Ditch="micromegas_DMsimpVectorMedVectorDM" ..
- name: Build scanners
Expand Down
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#************************************************

# Define minimum cmake version
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)

# Define minimum compiler versions
set(MIN_GCC_VERSION 9.1)
Expand Down Expand Up @@ -335,11 +335,7 @@ endif()

# Fix Boost < 1.55 for Clang
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
if(${CMAKE_VERSION} VERSION_LESS 3.12.0)
add_definitions(-DBOOST_PP_VARIADICS=1)
else()
add_compile_definitions(BOOST_PP_VARIADICS=1)
endif()
add_compile_definitions(BOOST_PP_VARIADICS=1)
endif()

# Check for Eigen
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ COMPULSORY:

- gcc >= 9 / llvm clang >= 10 / AppleClang >= 13 / icc >= 15.0.2
- gfortran >= 9 / ifort >=15.0.2
- CMake 3.2.3 or greater
- CMake 3.16.3 or greater
- Python 3
- Python modules: yaml, future, os, re, datetime, sys, getopt, shutil and itertools.
- git
Expand Down
40 changes: 0 additions & 40 deletions cmake/FindSQLite3.cmake
View file
Open in desktop

This file was deleted.