diff options
| author | Juan Ramos <juan@lunarg.com> | 2023-01-27 14:32:07 -0700 |
|---|---|---|
| committer | Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> | 2023-01-27 14:44:31 -0700 |
| commit | b271b459c7e79eddd52dd7af01ee4d012c48b1e5 (patch) | |
| tree | 67a03929fb050438240ac095a8835ee33109c564 | |
| parent | 8ad79c18ffb12cf903cad96a196c33d335f0cdb4 (diff) | |
| download | usermoji-b271b459c7e79eddd52dd7af01ee4d012c48b1e5.tar.xz | |
cmake: Raise min to 3.17
| -rw-r--r-- | .github/workflows/build.yml | 5 | ||||
| -rw-r--r-- | BUILD.md | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe47a53b..f8805e67 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,8 +105,9 @@ jobs: - uses: actions/setup-python@v2 with: python-version: '3.7' - - name: Install Ninja - run: brew install ninja + - uses: lukka/get-cmake@latest + with: + cmakeVersion: 3.17.2 - name: Cache dependencies id: cache-deps uses: actions/cache@v3 @@ -267,7 +267,7 @@ Also `CMAKE_EXPORT_COMPILE_COMMANDS` is implemented only by Makefile and Ninja g - [2017](https://www.visualstudio.com/vs/downloads/) - The Community Edition of each of the above versions is sufficient, as well as any more capable edition. -- [CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-win64-x64.zip) is recommended. +- [CMake 3.17.2](https://cmake.org/files/v3.17/cmake-3.17.2-win64-x64.zip) is recommended. - Use the installer option to add CMake to the system PATH - Git Client Support - [Git for Windows](http://git-scm.com/download/win) is a popular solution @@ -414,7 +414,7 @@ that the minimum officially supported C++11 compiler version is GCC 5.4.0, although earlier versions may work. It should be straightforward to adapt this repository to other Linux distributions. -[CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz) is recommended. +[CMake 3.17.2](https://cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.tar.gz) is recommended. #### Required Package List diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea2b49f..9821a426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # ~~~ -# Copyright (c) 2014-2022 Valve Corporation -# Copyright (c) 2014-2022 LunarG, Inc. +# Copyright (c) 2014-2023 Valve Corporation +# Copyright (c) 2014-2023 LunarG, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ~~~ -cmake_minimum_required(VERSION 3.10.2) +cmake_minimum_required(VERSION 3.17.2) project(Vulkan-Tools) @@ -145,6 +145,7 @@ elseif(MSVC) if(BUILD_WERROR) add_compile_options("/WX") endif() + add_compile_options("/W3") # Warn about nested declarations add_compile_options("/w34456") # Warn about potentially uninitialized variables |