SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Meta+Toolchain+Ports: Update CMake to 3.30.0, set it as minimum version

Browse Source 
CMake learned which gcc flag to translate `set(CMAKE_CXX_STANDARD 26)`
to in CMake 3.30.0:
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9434

Using earlier versions leads to

    ...requires the language dialect "CXX26" .  But the
    current compiler "GCC" does not support this, or CMake does not know
    the flags to enable it.

errors after #26524.
This commit is contained in:
Nico Weber committed 2026-01-22 16:19:29 -05:00
1 parent ab5061a92b
commit 1961d12f5b
5 files changed
+8 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Meta/CMake/cmake-version.cmake
+1 -1
View File
@@ -1,6 +1,6 @@
# Note: Update this alongside Toolchain/BuildCMake.sh
set(version_ok 0)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.25.1)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.30.0)
set(version_ok 1)
endif()
execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "${version_ok}")
Meta/CMake/use_linker.cmake
+2 -10
View File
@@ -19,14 +19,6 @@ if (NOT APPLE AND NOT LAGOM_USE_LINKER)
endif()
if (LAGOM_USE_LINKER)
# FIXME: Move to only setting CMAKE_LINKER_TYPE once we drop support for CMake < 3.29
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
string(TOUPPER ${LAGOM_USE_LINKER} linker_type)
set(CMAKE_LINKER_TYPE ${linker_type})
else()
set(LINKER_FLAG "-fuse-ld=${LAGOM_USE_LINKER}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAG}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAG}")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAG}")
endif()
string(TOUPPER ${LAGOM_USE_LINKER} linker_type)
set(CMAKE_LINKER_TYPE ${linker_type})
endif()
Ports/AvailablePorts.md
+1 -1
View File
@@ -42,7 +42,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`chromaprint`](chromaprint/) | chromaprint | 1.5.1 | https://acoustid.org/ |
| [`citron`](citron/) | Citron Programming Language | 0.0.9.3 | https://github.com/alimpfard/citron |
| [`ClassiCube`](ClassiCube/) | ClassiCube | 1.3.6 | https://github.com/UnknownShadow200/ClassiCube |
| [`cmake`](cmake/) | CMake | 3.26.4 | https://cmake.org/ |
| [`cmake`](cmake/) | CMake | 3.30.0 | https://cmake.org/ |
| [`cmatrix`](cmatrix/) | cmatrix | 5c082c6 | https://github.com/abishekvashok/cmatrix |
| [`composer`](composer/) | Composer | 2.6.5 | https://getcomposer.org/ |
| [`coreutils`](coreutils/) | GNU core utilities | 9.9 | https://www.gnu.org/software/coreutils/ |
Ports/cmake/package.sh
+2 -2
View File
@@ -1,10 +1,10 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='cmake'
# NOTE: keep this version aligned with Toolchain/BuildCMake.sh
version='3.26.4'
version='3.30.0'
useconfigure='true'
files=(
"https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}.tar.gz#313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208"
"https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}.tar.gz#157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579"
)
depends=(
'bash'
Toolchain/BuildCMake.sh
+2 -2
View File
@@ -17,8 +17,8 @@ NPROC=$(get_number_of_processing_units)
[ -z "$MAKEJOBS" ] && MAKEJOBS=${NPROC}
# Note: Update this alongside the cmake port, and Meta/CMake/cmake-version.cmake if the build requires this version of cmake.
CMAKE_VERSION=3.26.4
CMAKE_ARCHIVE_SHA256=313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208
CMAKE_VERSION=3.30.0
CMAKE_ARCHIVE_SHA256=157e5be6055c154c34f580795fe5832f260246506d32954a971300ed7899f579
CMAKE_ARCHIVE=cmake-${CMAKE_VERSION}.tar.gz
CMAKE_ARCHIVE_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ARCHIVE}