From 497664b23c2f5036992a025ea8204848df2a7918 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 28 Aug 2024 12:42:13 -0700 Subject: [PATCH] Doc: CMake 3.24+ --- README.md | 4 ++-- docs/source/install/dependencies.rst | 2 +- pyproject.toml | 2 +- setup.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3cec9f38..ea27453e 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ If you just want to use CMake to build the project, jump into sections *1. Intro pyAMReX depends on the following popular third party software. - a mature [C++17](https://en.wikipedia.org/wiki/C%2B%2B17) compiler, e.g., GCC 8, Clang 7, NVCC 11.0, MSVC 19.15 or newer -- [CMake 3.20.0+](https://cmake.org) +- [CMake 3.24.0+](https://cmake.org) - [AMReX *development*](https://amrex-codes.github.io): we automatically download and compile a copy of AMReX - [pybind11](https://github.com/pybind/pybind11/) 2.12.0+: we automatically download and compile a copy of pybind11 ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE)) - [Python](https://python.org) 3.8+ @@ -85,7 +85,7 @@ brew update brew install ccache cmake libomp mpi4py numpy open-mpi python ``` -Now, `cmake --version` should be at version 3.20.0 or newer. +Now, `cmake --version` should be at version 3.24.0 or newer. Or go: ```bash diff --git a/docs/source/install/dependencies.rst b/docs/source/install/dependencies.rst index 9c93ee65..ef0d6222 100644 --- a/docs/source/install/dependencies.rst +++ b/docs/source/install/dependencies.rst @@ -7,7 +7,7 @@ pyAMReX depends on the following popular third party software. Please see installation instructions below. - a mature `C++17 `__ compiler, e.g., GCC 8.4+, Clang 7, NVCC 11.0, MSVC 19.15 or newer -- `CMake 3.20.0+ `__ +- `CMake 3.24.0+ `__ - `Git 2.18+ `__ - `AMReX `__: we automatically download and compile a copy - `pybind11 2.12.0+ `__: we automatically download and compile a copy diff --git a/pyproject.toml b/pyproject.toml index 38ddd6e8..b0de3c66 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools>=42", "wheel", - "cmake>=3.20.0,<4.0.0", + "cmake>=3.24.0,<4.0.0", "packaging>=23", ] build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py index 1d1b3700..30676dd2 100644 --- a/setup.py +++ b/setup.py @@ -56,14 +56,14 @@ def run(self): out = subprocess.check_output(["cmake", "--version"]) except OSError: raise RuntimeError( - "CMake 3.20.0+ must be installed to build the following " + "CMake 3.24.0+ must be installed to build the following " + "extensions: " + ", ".join(e.name for e in self.extensions) ) cmake_version = parse(re.search(r"version\s*([\d.]+)", out.decode()).group(1)) - if cmake_version < parse("3.20.0"): - raise RuntimeError("CMake >= 3.20.0 is required") + if cmake_version < parse("3.24.0"): + raise RuntimeError("CMake >= 3.24.0 is required") for ext in self.extensions: self.build_extension(ext)