Skip to content
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

Jump to bottom

CMake minimum version 3.10 #13760

Merged
merged 2 commits into from
Oct 11, 2024
Merged

CMake minimum version 3.10 #13760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef4245
test: avoid need for explict CMake minimum
scivision Oct 6, 2024
e244dee
toolchain.py minimum CMake 3.10 to avoid deprecation warning
scivision Oct 6, 2024
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
2 changes: 1 addition & 1 deletion mesonbuild/cmake/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def update_cmake_compiler_state(self) -> None:
languages = list(self.compilers.keys())
lang_ids = [language_map.get(x, x.upper()) for x in languages]
cmake_content = dedent(f'''
cmake_minimum_required(VERSION 3.7)
cmake_minimum_required(VERSION 3.10)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we able to get away with the same "whatever the current version is" trick here too?

project(CompInfo {' '.join(lang_ids)})
''')

Expand Down
4 changes: 2 additions & 2 deletions test cases/cmake/1 basic/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand All @@ -12,7 +12,7 @@ target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21)
target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42)

# Test PCH support
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0")
target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp")
endif()

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/10 header only/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/11 cmake_module_path/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/12 generator expressions/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/13 system includes/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/16 threads/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod C CXX)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/17 include path order/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/18 skip include files/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set(CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/21 shared module/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmModule)

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/23 cmake toolchain/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod NONE)

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/23 cmake toolchain/subprojects/cmModFortran/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(cmMod NONE)

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/24 mixing languages/subprojects/cmTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmTest LANGUAGES C OBJC)

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/25 assembler/subprojects/cmTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmTest)

Expand Down
4 changes: 2 additions & 2 deletions test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod VERSION 1.2.3)
set(CMAKE_CXX_STANDARD 14)
Expand All @@ -12,7 +12,7 @@ target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21)
target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42)

# Test PCH support
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16.0")
target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp")
endif()

Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmModDummy)
2 changes: 1 addition & 1 deletion test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(cmModBoth)
2 changes: 1 addition & 1 deletion test cases/cmake/3 advanced no dep/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set(CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/cmake/8 custom command/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmMod)
set (CMAKE_CXX_STANDARD 14)
Expand Down
2 changes: 1 addition & 1 deletion test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmlib)

Expand Down
2 changes: 1 addition & 1 deletion test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmlib)

Expand Down
2 changes: 1 addition & 1 deletion test cases/unit/1 soname/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# soname to 1.2.3 but Autotools sets it to 1.

project(vertest C)
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION ${CMAKE_VERSION})

add_library(nover SHARED versioned.c)

Expand Down
Loading