From 18dfb7da365f4c150976ff1d7e3351bde5716601 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 9 Aug 2024 14:54:33 +0000 Subject: [PATCH] chore: bump to 3.30.2 --- .bumpversion.cfg | 2 +- .gitlab-ci.yml | 2 +- README.md | 2 +- chapters/basics.md | 6 +++--- chapters/intro/installing.md | 14 +++++++------- chapters/intro/newcmake.md | 21 +++++++++++++++++++++ examples/CMakeLists.txt | 2 +- examples/extended-project/CMakeLists.txt | 4 ++-- examples/fetch/CMakeLists.txt | 2 +- examples/root-dict/CMakeLists.txt | 2 +- examples/root-simple/CMakeLists.txt | 2 +- examples/root-usefile/CMakeLists.txt | 2 +- examples/simple-project/CMakeLists.txt | 2 +- 13 files changed, 42 insertions(+), 21 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9302362..c43370b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.29.0 +current_version = 3.30.2 [bumpversion:file:.gitlab-ci.yml] search = cmake-{current_version}-linux diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 529bdee..5d5e9fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ test_code: - apt-get update && apt-get install -y make cmake libboost-dev git # We will install latest CMake, even though Ubuntu has a recent one - mkdir -p $HOME/.local - - curl -s "https://cmake.org/files/v3.29/cmake-3.29.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local + - curl -s "https://cmake.org/files/v3.30/cmake-3.30.2-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C $HOME/.local - export PATH=$HOME/.local/bin:$PATH script: - cmake -S examples -B build diff --git a/README.md b/README.md index c519813..49339aa 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Certainly there are no shortage of problems when building. But I think that, in 2023, 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! 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.5+, maybe even CMake 3.29+! +I'm talking about Modern CMake. CMake 3.5+, maybe even CMake 3.30+! 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! diff --git a/chapters/basics.md b/chapters/basics.md index a5382ac..7931d02 100644 --- a/chapters/basics.md +++ b/chapters/basics.md @@ -34,7 +34,7 @@ Windows users, who also usually have a very recent version of CMake. This is what new projects should do: ```cmake -cmake_minimum_required(VERSION 3.7...3.29) +cmake_minimum_required(VERSION 3.7...3.30) if(${CMAKE_VERSION} VERSION_LESS 3.12) cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) @@ -54,10 +54,10 @@ you will want to do this instead: ```cmake cmake_minimum_required(VERSION 3.7) -if(${CMAKE_VERSION} VERSION_LESS 3.29) +if(${CMAKE_VERSION} VERSION_LESS 3.30) cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) else() - cmake_policy(VERSION 3.29) + cmake_policy(VERSION 3.30) endif() ``` diff --git a/chapters/intro/installing.md b/chapters/intro/installing.md index 76d70a0..fc4ad5b 100644 --- a/chapters/intro/installing.md +++ b/chapters/intro/installing.md @@ -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. {% 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.29+ 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.30+ support... #### 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]: {% term %} -~ $ wget -qO- "https://cmake.org/files/v3.29/cmake-3.29.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local +~ $ wget -qO- "https://cmake.org/files/v3.30/cmake-3.30.2-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C ~/.local {% 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: {% term %} -~ $ mkdir -p cmake-3.29 && wget -qO- "https://cmake.org/files/v3.29/cmake-3.29.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.29 -~ $ export PATH=`pwd`/cmake-3.29/bin:$PATH +~ $ mkdir -p cmake-3.30 && wget -qO- "https://cmake.org/files/v3.30/cmake-3.30.2-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C cmake-3.30 +~ $ export PATH=`pwd`/cmake-3.30/bin:$PATH {% 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. @@ -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. {% term %} -docker $ wget -qO- "https://cmake.org/files/v3.29/cmake-3.29.0-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local +docker $ wget -qO- "https://cmake.org/files/v3.30/cmake-3.30.2-linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local {% endterm %} 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 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.29.0 | kept up to date | -| [GitHub Actions 20.04](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md) | 3.29.0 | Same runners as Azure DevOps | +| [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops#use-a-microsoft-hosted-agent) | 3.30.0 | kept up to date | +| [GitHub Actions 20.04](https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md) | 3.30.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. diff --git a/chapters/intro/newcmake.md b/chapters/intro/newcmake.md index 308bc33..f7ed2cb 100644 --- a/chapters/intro/newcmake.md +++ b/chapters/intro/newcmake.md @@ -4,7 +4,27 @@ This is an abbreviated version of the CMake changelog with just the highlights f ## [CMake in development][cmake master]: WIP +- LFortan now supported +- `$comment` supported in preset files +- `cmake -LR ` to search the cache + + +## [CMake 3.30][]: C++26 + +This release adds C++26 support and a way to get the latest supported standard +for a compiler. This release makes a lot of small changes not listed below, +like better TLS support, some generator expression updates, and some schema +updates. + +- Initially released [July 2, 2024](https://www.kitware.com/cmake-3-30-0-available-for-download/) - A `$` generator expression was added to produce `"` +- C++26 compile features support fully implemented (partial since 3.25) +- `CMAKE__STANDARD_LATEST` holds the latest standard the current compiler supports +- Free-threaded Python 3.13+ support +- Better support (new variables and targets) for Windows Python debug builds, and `DEBUG_POSTFIX` now added by `python_add_library` +- FindBoost removed +- Visual Studio 2008 support removed + ## [CMake 3.29][]: Build before testing @@ -533,5 +553,6 @@ There were a ton of additions to this version of CMake, primarily to fill out th [cmake 3.27]: https://cmake.org/cmake/help/latest/release/3.27.html [cmake 3.28]: https://cmake.org/cmake/help/latest/release/3.28.html [cmake 3.29]: https://cmake.org/cmake/help/latest/release/3.29.html +[cmake 3.30]: https://cmake.org/cmake/help/latest/release/3.30.html [cmake master]: https://cmake.org/cmake/help/git-master/release/index.html [fastercmake]: https://blog.kitware.com/improving-cmakes-runtime-performance/ diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 1aac08a..9154c2b 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11...3.29) +cmake_minimum_required(VERSION 3.11...3.30) project(ModernCMakeExamples) set(MODERN_CMAKE_BUILD_TESTING ON) diff --git a/examples/extended-project/CMakeLists.txt b/examples/extended-project/CMakeLists.txt index 29274d6..b002358 100644 --- a/examples/extended-project/CMakeLists.txt +++ b/examples/extended-project/CMakeLists.txt @@ -1,5 +1,5 @@ -# Works with 3.14 and tested through 3.29 -cmake_minimum_required(VERSION 3.14...3.29) +# Works with 3.14 and tested through 3.30 +cmake_minimum_required(VERSION 3.14...3.30) # Project name and a few useful settings. Other commands can pick up the results project( diff --git a/examples/fetch/CMakeLists.txt b/examples/fetch/CMakeLists.txt index d86da63..ae6c1bf 100644 --- a/examples/fetch/CMakeLists.txt +++ b/examples/fetch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14...3.29) +cmake_minimum_required(VERSION 3.14...3.30) project(FetchExample LANGUAGES CXX) diff --git a/examples/root-dict/CMakeLists.txt b/examples/root-dict/CMakeLists.txt index 5591514..98b3909 100644 --- a/examples/root-dict/CMakeLists.txt +++ b/examples/root-dict/CMakeLists.txt @@ -2,7 +2,7 @@ ## [main] -cmake_minimum_required(VERSION 3.4...3.29) +cmake_minimum_required(VERSION 3.4...3.30) project(RootDictExample LANGUAGES CXX) diff --git a/examples/root-simple/CMakeLists.txt b/examples/root-simple/CMakeLists.txt index d297e88..1ec8f1f 100644 --- a/examples/root-simple/CMakeLists.txt +++ b/examples/root-simple/CMakeLists.txt @@ -1,7 +1,7 @@ # CMake ROOT simple example ## [main] -cmake_minimum_required(VERSION 3.1...3.29) +cmake_minimum_required(VERSION 3.1...3.30) project(RootSimpleExample LANGUAGES CXX) diff --git a/examples/root-usefile/CMakeLists.txt b/examples/root-usefile/CMakeLists.txt index 05bcf82..cbd03e6 100644 --- a/examples/root-usefile/CMakeLists.txt +++ b/examples/root-usefile/CMakeLists.txt @@ -1,7 +1,7 @@ # CMake ROOT usefile example ## [main] -cmake_minimum_required(VERSION 3.1...3.29) +cmake_minimum_required(VERSION 3.1...3.30) project(RootUseFileExample LANGUAGES CXX) diff --git a/examples/simple-project/CMakeLists.txt b/examples/simple-project/CMakeLists.txt index e2181a6..48976c1 100644 --- a/examples/simple-project/CMakeLists.txt +++ b/examples/simple-project/CMakeLists.txt @@ -6,7 +6,7 @@ # You should always specify a range with the newest # and oldest tested versions of CMake. This will ensure # you pick up the best policies. -cmake_minimum_required(VERSION 3.1...3.29) +cmake_minimum_required(VERSION 3.1...3.30) # This is your project statement. You should always list languages; # Listing the version is nice here since it sets lots of useful variables