Skip to content

Commit 234c4b7

Browse files
jpr42charles-lunarg
authored andcommitted
cmake: Update minimum version to 3.22.1
Matches Vulkan Validation Layers and SPIRV-Tools.
1 parent 39f924b commit 234c4b7

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ ubuntu-latest, macos-latest ]
24-
cmake-version: [ '3.15', 'latest']
24+
cmake-version: [ '3.22.1', 'latest']
2525
steps:
2626
- uses: actions/checkout@v4
2727
- uses: lukka/get-cmake@latest
@@ -39,7 +39,7 @@ jobs:
3939
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4040
strategy:
4141
matrix:
42-
cmake-version: [ '3.15', 'latest']
42+
cmake-version: [ '3.22.1', 'latest']
4343
steps:
4444
- uses: actions/checkout@v4
4545
- uses: lukka/get-cmake@latest

CMakeLists.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# SPDX-License-Identifier: Apache-2.0
77
# ~~~
8-
cmake_minimum_required(VERSION 3.15)
8+
cmake_minimum_required(VERSION 3.22.1)
99

1010
# NOTE: Parsing the version like this is suboptimal but neccessary due to our release process:
1111
# https://github.com/KhronosGroup/Vulkan-Headers/pull/346
@@ -72,11 +72,6 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.28" AND VULKAN_HEADERS_ENABLE_MODULE
7272
target_link_libraries(Vulkan-Module PUBLIC Vulkan-Headers)
7373
endif ()
7474

75-
if (CMAKE_VERSION VERSION_LESS "3.21")
76-
# https://cmake.org/cmake/help/latest/variable/PROJECT_IS_TOP_LEVEL.html
77-
string(COMPARE EQUAL ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} PROJECT_IS_TOP_LEVEL)
78-
endif()
79-
8075
option(VULKAN_HEADERS_ENABLE_TESTS "Test Vulkan-Headers" ${PROJECT_IS_TOP_LEVEL})
8176
option(VULKAN_HEADERS_ENABLE_INSTALL "Install Vulkan-Headers" ${PROJECT_IS_TOP_LEVEL})
8277

tests/integration/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# SPDX-License-Identifier: Apache-2.0
77
# ~~~
8-
cmake_minimum_required(VERSION 3.14.2)
8+
cmake_minimum_required(VERSION 3.22.1)
99

1010
project(API LANGUAGES C)
1111

0 commit comments

Comments
 (0)