Update to CMake 3.25.0
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
This commit is contained in:
parent
08d25dde92
commit
4825ba37ed
@ -1,5 +1,5 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
current_version = 3.24.0
|
current_version = 3.25.0
|
||||||
|
|
||||||
[bumpversion:file:.gitlab-ci.yml]
|
[bumpversion:file:.gitlab-ci.yml]
|
||||||
search = cmake-{current_version}-linux
|
search = cmake-{current_version}-linux
|
||||||
|
@ -5,7 +5,7 @@ test_code:
|
|||||||
- apt-get update && apt-get install -y make cmake libboost-dev git
|
- apt-get update && apt-get install -y make cmake libboost-dev git
|
||||||
# We will install latest CMake, even though Ubuntu has a recent one
|
# We will install latest CMake, even though Ubuntu has a recent one
|
||||||
- mkdir -p $HOME/.local
|
- mkdir -p $HOME/.local
|
||||||
- curl -s "https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local
|
- curl -s "https://cmake.org/files/v3.25/cmake-3.25.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local
|
||||||
- export PATH=$HOME/.local/bin:$PATH
|
- export PATH=$HOME/.local/bin:$PATH
|
||||||
script:
|
script:
|
||||||
- cmake -S examples -B build
|
- cmake -S examples -B build
|
||||||
|
@ -7,7 +7,7 @@ Certainly there are no shortage of problems when building.
|
|||||||
But I think that, in 2022, we have a very good solution to quite a few of those problems.
|
But I think that, in 2022, we have a very good solution to quite a few of those problems.
|
||||||
It's CMake. Not CMake 2.8 though; that was released before C++11 even existed!
|
It's CMake. Not CMake 2.8 though; that was released before C++11 even existed!
|
||||||
Nor the horrible examples out there for CMake (even those posted on KitWare's own tutorials list).
|
Nor the horrible examples out there for CMake (even those posted on KitWare's own tutorials list).
|
||||||
I'm talking about Modern CMake. CMake 3.4+, maybe even CMake 3.24+!
|
I'm talking about Modern CMake. CMake 3.4+, maybe even CMake 3.25+!
|
||||||
It's clean, powerful, and elegant, so you can spend most of your time coding, not adding lines to an unreadable, unmaintainable Make (Or CMake 2) file.
|
It's clean, powerful, and elegant, so you can spend most of your time coding, not adding lines to an unreadable, unmaintainable Make (Or CMake 2) file.
|
||||||
And CMake 3.11+ is supposed to be significantly faster, as well!
|
And CMake 3.11+ is supposed to be significantly faster, as well!
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ Windows users, who also usually have a very recent version of CMake.
|
|||||||
This is what new projects should do:
|
This is what new projects should do:
|
||||||
|
|
||||||
```cmake
|
```cmake
|
||||||
cmake_minimum_required(VERSION 3.7...3.24)
|
cmake_minimum_required(VERSION 3.7...3.25)
|
||||||
|
|
||||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||||
@ -54,10 +54,10 @@ you will want to do this instead:
|
|||||||
```cmake
|
```cmake
|
||||||
cmake_minimum_required(VERSION 3.7)
|
cmake_minimum_required(VERSION 3.7)
|
||||||
|
|
||||||
if(${CMAKE_VERSION} VERSION_LESS 3.24)
|
if(${CMAKE_VERSION} VERSION_LESS 3.25)
|
||||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||||
else()
|
else()
|
||||||
cmake_policy(VERSION 3.24)
|
cmake_policy(VERSION 3.25)
|
||||||
endif()
|
endif()
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
Your CMake version should be newer than your compiler. It should be newer than the libraries you are using (especially Boost). New versions work better for everyone.
|
Your CMake version should be newer than your compiler. It should be newer than the libraries you are using (especially Boost). New versions work better for everyone.
|
||||||
{% endhint %}
|
{% endhint %}
|
||||||
|
|
||||||
If you have a built in copy of CMake, it isn't special or customized for your system. You can easily install a new one instead, either on the system level or the user level. Feel free to instruct your users here if they complain about a CMake requirement being set too high. Especially if they want 3.1+ support. Maybe even if they want 3.24+ support...
|
If you have a built in copy of CMake, it isn't special or customized for your system. You can easily install a new one instead, either on the system level or the user level. Feel free to instruct your users here if they complain about a CMake requirement being set too high. Especially if they want 3.1+ support. Maybe even if they want 3.25+ support...
|
||||||
|
|
||||||
#### Quick list (more info on each method below)
|
#### Quick list (more info on each method below)
|
||||||
|
|
||||||
@ -35,14 +35,14 @@ You can [download CMake from KitWare][download]. This is how you will probably g
|
|||||||
On Linux, there are several options. Kitware provides a [Debian/Ubuntu apt repository][apt], as well as [snap packages][snap]. There are universal Linux binaries provided, but you'll need to pick an install location. If you already use `~/.local` for user-space packages, the following single line command[^1] will get CMake for you [^2]:
|
On Linux, there are several options. Kitware provides a [Debian/Ubuntu apt repository][apt], as well as [snap packages][snap]. There are universal Linux binaries provided, but you'll need to pick an install location. If you already use `~/.local` for user-space packages, the following single line command[^1] will get CMake for you [^2]:
|
||||||
|
|
||||||
{% term %}
|
{% term %}
|
||||||
~ $ wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local
|
~ $ wget -qO- "https://cmake.org/files/v3.25/cmake-3.25.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local
|
||||||
{% endterm %}
|
{% endterm %}
|
||||||
|
|
||||||
The names changed in 3.20; older releases had names like `cmake-3.19.7-Linux-x86_64.tar.gz`. If you just want a local folder with CMake only:
|
The names changed in 3.20; older releases had names like `cmake-3.19.7-Linux-x86_64.tar.gz`. If you just want a local folder with CMake only:
|
||||||
|
|
||||||
{% term %}
|
{% term %}
|
||||||
~ $ mkdir -p cmake-3.24 && wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.24
|
~ $ mkdir -p cmake-3.25 && wget -qO- "https://cmake.org/files/v3.25/cmake-3.25.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.25
|
||||||
~ $ export PATH=`pwd`/cmake-3.24/bin:$PATH
|
~ $ export PATH=`pwd`/cmake-3.25/bin:$PATH
|
||||||
{% endterm %}
|
{% endterm %}
|
||||||
|
|
||||||
You'll obviously want to append to the PATH every time you start a new terminal, or add it to your `.bashrc` or to an [LMod][] system.
|
You'll obviously want to append to the PATH every time you start a new terminal, or add it to your `.bashrc` or to an [LMod][] system.
|
||||||
@ -50,7 +50,7 @@ You'll obviously want to append to the PATH every time you start a new terminal,
|
|||||||
And, if you want a system install, install to `/usr/local`; this is an excellent choice in a Docker container, for example on GitLab CI. Do not try it on a non-containerized system.
|
And, if you want a system install, install to `/usr/local`; this is an excellent choice in a Docker container, for example on GitLab CI. Do not try it on a non-containerized system.
|
||||||
|
|
||||||
{% term %}
|
{% term %}
|
||||||
docker $ wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local
|
docker $ wget -qO- "https://cmake.org/files/v3.25/cmake-3.25.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local
|
||||||
{% endterm %}
|
{% endterm %}
|
||||||
|
|
||||||
If you are on a system without wget, replace `wget -qO-` with `curl -s`.
|
If you are on a system without wget, replace `wget -qO-` with `curl -s`.
|
||||||
@ -132,8 +132,8 @@ Just `pip install cmake` on many systems. Add `--user` if you have to (modern pi
|
|||||||
| ------------------------------------------------------------------------------------------------------------------------------------ | ------------- | ------------------------------------------------------------ |
|
| ------------------------------------------------------------------------------------------------------------------------------------ | ------------- | ------------------------------------------------------------ |
|
||||||
| [TravisCI Xenial](https://docs.travis-ci.com/user/reference/xenial/#compilers-and-build-toolchain) | 3.12.4 | Mid November 2018 this image became ready for widescale use. |
|
| [TravisCI Xenial](https://docs.travis-ci.com/user/reference/xenial/#compilers-and-build-toolchain) | 3.12.4 | Mid November 2018 this image became ready for widescale use. |
|
||||||
| [TravisCI Bionic](https://docs.travis-ci.com/user/reference/bionic/#compilers-and-build-toolchain) | 3.12.4 | Same as Xenial at the moment. |
|
| [TravisCI Bionic](https://docs.travis-ci.com/user/reference/bionic/#compilers-and-build-toolchain) | 3.12.4 | Same as Xenial at the moment. |
|
||||||
| [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) | 3.24.3 | kept up to date |
|
| [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) | 3.25.0 | kept up to date |
|
||||||
| [GitHub Actions 20.04](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md) | 3.24.3 | Same runners as Azure DevOps |
|
| [GitHub Actions 20.04](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md) | 3.25.0 | Same runners as Azure DevOps |
|
||||||
|
|
||||||
If you are using GitHub Actions, also see the [jwlawson/actions-setup-cmake](https://github.com/marketplace/actions/actions-setup-cmake) action, which can install your selection of CMake, even in a docker action run.
|
If you are using GitHub Actions, also see the [jwlawson/actions-setup-cmake](https://github.com/marketplace/actions/actions-setup-cmake) action, which can install your selection of CMake, even in a docker action run.
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.11...3.24)
|
cmake_minimum_required(VERSION 3.11...3.25)
|
||||||
|
|
||||||
project(ModernCMakeExamples)
|
project(ModernCMakeExamples)
|
||||||
set(MODERN_CMAKE_BUILD_TESTING ON)
|
set(MODERN_CMAKE_BUILD_TESTING ON)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Works with 3.14 and tested through 3.24
|
# Works with 3.14 and tested through 3.25
|
||||||
cmake_minimum_required(VERSION 3.14...3.24)
|
cmake_minimum_required(VERSION 3.14...3.25)
|
||||||
|
|
||||||
# Project name and a few useful settings. Other commands can pick up the results
|
# Project name and a few useful settings. Other commands can pick up the results
|
||||||
project(
|
project(
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.14...3.24)
|
cmake_minimum_required(VERSION 3.14...3.25)
|
||||||
|
|
||||||
project(FetchExample LANGUAGES CXX)
|
project(FetchExample LANGUAGES CXX)
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
## [main]
|
## [main]
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.4...3.24)
|
cmake_minimum_required(VERSION 3.4...3.25)
|
||||||
|
|
||||||
project(RootDictExample LANGUAGES CXX)
|
project(RootDictExample LANGUAGES CXX)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# CMake ROOT simple example
|
# CMake ROOT simple example
|
||||||
|
|
||||||
## [main]
|
## [main]
|
||||||
cmake_minimum_required(VERSION 3.1...3.24)
|
cmake_minimum_required(VERSION 3.1...3.25)
|
||||||
|
|
||||||
project(RootSimpleExample LANGUAGES CXX)
|
project(RootSimpleExample LANGUAGES CXX)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# CMake ROOT usefile example
|
# CMake ROOT usefile example
|
||||||
|
|
||||||
## [main]
|
## [main]
|
||||||
cmake_minimum_required(VERSION 3.1...3.24)
|
cmake_minimum_required(VERSION 3.1...3.25)
|
||||||
|
|
||||||
project(RootUseFileExample LANGUAGES CXX)
|
project(RootUseFileExample LANGUAGES CXX)
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# You should always specify a range with the newest
|
# You should always specify a range with the newest
|
||||||
# and oldest tested versions of CMake. This will ensure
|
# and oldest tested versions of CMake. This will ensure
|
||||||
# you pick up the best policies.
|
# you pick up the best policies.
|
||||||
cmake_minimum_required(VERSION 3.1...3.24)
|
cmake_minimum_required(VERSION 3.1...3.25)
|
||||||
|
|
||||||
# This is your project statement. You should always list languages;
|
# This is your project statement. You should always list languages;
|
||||||
# Listing the version is nice here since it sets lots of useful variables
|
# Listing the version is nice here since it sets lots of useful variables
|
||||||
|
Loading…
x
Reference in New Issue
Block a user