Skip to content

Commit b05d038

Browse files
Juan Ramoscharles-lunarg
authored andcommitted
cmake: Update minimum version to 3.22.1
Matches Vulkan Validation Layers and SPIRV-Tools.
1 parent aad266e commit b05d038

File tree

6 files changed

+10
-15
lines changed

6 files changed

+10
-15
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: ${{ matrix.os == 'ubuntu-20.04' }}
5757
uses: lukka/get-cmake@latest
5858
with:
59-
cmakeVersion: 3.17.2
59+
cmakeVersion: 3.22.1
6060
- run: sudo apt update
6161
- run: sudo apt install --yes --no-install-recommends libwayland-dev libxrandr-dev
6262
# This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
@@ -115,7 +115,7 @@ jobs:
115115
python-version: '3.11'
116116
- uses: lukka/get-cmake@latest
117117
with:
118-
cmakeVersion: 3.17.2
118+
cmakeVersion: 3.22.1
119119
- name: Enable 32 bit
120120
run: sudo dpkg --add-architecture i386
121121
- run: sudo apt-get update
@@ -152,7 +152,7 @@ jobs:
152152
python-version: '3.11'
153153
- uses: lukka/get-cmake@latest
154154
with:
155-
cmakeVersion: 3.17.2
155+
cmakeVersion: 3.22.1
156156
- name: Enable 32 bit
157157
run: sudo dpkg --add-architecture i386
158158
- run: sudo apt-get update

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
- uses: lukka/get-cmake@latest
7878
if: matrix.language == 'cpp'
7979
with:
80-
cmakeVersion: 3.17.2
80+
cmakeVersion: 3.22.1
8181
- name: Install Dependencies
8282
if: matrix.language == 'cpp'
8383
run: |

BUILD.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ indicated by *install_dir*:
8181
## Build Requirements
8282

8383
1. `C99` capable compiler
84-
2. `CMake` version 3.17.2 or greater
84+
2. `CMake` version 3.22.1 or greater
8585
3. `Git`
8686

8787
### Test Requirements
@@ -271,7 +271,7 @@ These variables should be set using the `-D` option when invoking CMake to gener
271271
- [2019](https://www.visualstudio.com/vs/older-downloads/)
272272
- The Community Edition of each of the above versions is sufficient, as
273273
well as any more capable edition.
274-
- [CMake 3.17.2](https://cmake.org/files/v3.17/cmake-3.17.2-win64-x64.zip) is recommended.
274+
- [CMake 3.22.1](https://cmake.org/files/v3.22.1/cmake-3.22.1-win64-x64.zip) is recommended.
275275
- Use the installer option to add CMake to the system PATH
276276
- Git Client Support
277277
- [Git for Windows](http://git-scm.com/download/win) is a popular solution
@@ -382,7 +382,7 @@ This repository has been built and tested on the two most recent Ubuntu LTS
382382
versions, although earlier versions may work.
383383
It is be straightforward to adapt this repository to other Linux distributions.
384384

385-
[CMake 3.17.2](https://cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.tar.gz) is recommended.
385+
[CMake 3.22.1](https://cmake.org/files/v3.22.1/cmake-3.22.1-Linux-x86_64.tar.gz) is recommended.
386386

387387
#### Required Package List
388388

@@ -561,7 +561,7 @@ Clone the Vulkan-Loader repository:
561561

562562
### MacOS build
563563

564-
[CMake 3.17.2](https://cmake.org/files/v3.17/cmake-3.17.2-Darwin-x86_64.tar.gz) is recommended.
564+
[CMake 3.22.1](https://cmake.org/files/v3.22.1/cmake-3.22.1-Darwin-x86_64.tar.gz) is recommended.
565565

566566
#### Building with the Unix Makefiles Generator
567567

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818
# ~~~
19-
cmake_minimum_required(VERSION 3.17.2)
19+
cmake_minimum_required(VERSION 3.22.1)
2020

2121
project(VULKAN_LOADER VERSION 1.4.307 LANGUAGES C)
2222

tests/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
2323
# Make sure tests uses the dynamic runtime instead
2424
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
2525

26-
# For MSVC/Windows, replace /GR with an empty string, this prevents warnings of /GR being overriden by /GR-
27-
# Newer CMake versions (3.20) have better solutions for this through policy - using the old
28-
# way while waiting for when updating can occur
29-
string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
30-
3126
if (IS_DIRECTORY "${GOOGLETEST_INSTALL_DIR}/googletest")
3227
set(BUILD_GTEST ON)
3328
set(BUILD_GMOCK OFF)

tests/integration/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
# ~~~
17-
cmake_minimum_required(VERSION 3.17.2)
17+
cmake_minimum_required(VERSION 3.22.1)
1818

1919
project(INTEGRATION LANGUAGES C)
2020

0 commit comments

Comments
 (0)