From 52a70b7d89653c4ff21c84f590acdba8baef7b3c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 8 Mar 2023 09:53:54 +0100 Subject: [PATCH] cmake: Bump minimal cmake version to 3.23 --- CMakeLists.txt | 2 +- api/cpp/CMakeLists.txt | 2 +- api/cpp/README.md | 2 +- api/cpp/docs/cmake.md | 2 +- api/cpp/docs/getting_started.md | 2 +- docs/tutorial/cpp/src/CMakeLists.txt | 2 +- docs/tutorial/cpp/src/getting_started.md | 4 ++-- examples/CMakeLists.txt | 2 +- examples/carousel/cpp/CMakeLists.txt | 2 +- examples/gallery/CMakeLists.txt | 2 +- examples/iot-dashboard/CMakeLists.txt | 2 +- examples/memory/CMakeLists.txt | 2 +- examples/opengl_underlay/CMakeLists.txt | 2 +- examples/printerdemo/cpp/CMakeLists.txt | 2 +- examples/printerdemo/cpp_interpreted/CMakeLists.txt | 2 +- examples/printerdemo_old/cpp/CMakeLists.txt | 2 +- examples/qt_viewer/CMakeLists.txt | 2 +- examples/todo/cpp/CMakeLists.txt | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fea8a211a7..c0e4ddb77a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.23) project(Slint LANGUAGES CXX) diff --git a/api/cpp/CMakeLists.txt b/api/cpp/CMakeLists.txt index a9d688436ff..a082d8fe1f3 100644 --- a/api/cpp/CMakeLists.txt +++ b/api/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.23) project(Slint HOMEPAGE_URL "https://slint-ui.com/" LANGUAGES CXX) include(FeatureSummary) diff --git a/api/cpp/README.md b/api/cpp/README.md index 618509d4a96..a0e2d37bfb0 100644 --- a/api/cpp/README.md +++ b/api/cpp/README.md @@ -25,7 +25,7 @@ First you need to install the prerequisites: * Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). Once this is done, you should have the ```rustc``` compiler and the ```cargo``` build system installed in your path. -* **[cmake](https://cmake.org/download/)** (3.21 or newer) +* **[cmake](https://cmake.org/download/)** (3.23 or newer) * A C++ compiler that supports C++20 (e.g., **MSVC 2019 16.6** on Windows) You can include Slint in your CMake project using CMake's `FetchContent` feature. Insert the following snippet into your diff --git a/api/cpp/docs/cmake.md b/api/cpp/docs/cmake.md index 0c094245cb4..e80883af7cc 100644 --- a/api/cpp/docs/cmake.md +++ b/api/cpp/docs/cmake.md @@ -42,7 +42,7 @@ First you need to install the prerequisites: * Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already have Rust installed, make sure that it's at least version 1.60 or newer. You can check which version you have installed by running `rustc --version`. Once this is done, you should have the ```rustc``` compiler and the ```cargo``` build system installed in your path. -* **[cmake](https://cmake.org/download/)** (3.21 or newer) +* **[cmake](https://cmake.org/download/)** (3.23 or newer) * A C++ compiler that supports C++20 (e.g., **MSVC 2019 16.6** on Windows) You can include Slint into your CMake project using CMake's diff --git a/api/cpp/docs/getting_started.md b/api/cpp/docs/getting_started.md index 8d820f25b56..8f9c37eeafb 100644 --- a/api/cpp/docs/getting_started.md +++ b/api/cpp/docs/getting_started.md @@ -15,7 +15,7 @@ target in two steps: A minimal CMake `CMakeLists.txt` file looks like this: ```cmake -cmake_minimum_required(VERSION 3.21) +cmake_minimum_required(VERSION 3.23) project(my_application LANGUAGES CXX) # Note: Use find_package(Slint) instead of the following three commands, diff --git a/docs/tutorial/cpp/src/CMakeLists.txt b/docs/tutorial/cpp/src/CMakeLists.txt index 306c2abfed3..ee0a7dc7271 100644 --- a/docs/tutorial/cpp/src/CMakeLists.txt +++ b/docs/tutorial/cpp/src/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) if (NOT TARGET Slint::Slint) find_package(Slint REQUIRED) diff --git a/docs/tutorial/cpp/src/getting_started.md b/docs/tutorial/cpp/src/getting_started.md index 1b0a96c3739..185e2934004 100644 --- a/docs/tutorial/cpp/src/getting_started.md +++ b/docs/tutorial/cpp/src/getting_started.md @@ -14,7 +14,7 @@ In a new directory, we create a new `CMakeLists.txt` file. ```cmake # CMakeLists.txt -cmake_minimum_required(VERSION 3.21) +cmake_minimum_required(VERSION 3.23) project(memory LANGUAGES CXX) include(FetchContent) @@ -79,6 +79,6 @@ memory_game Feel free to use your favorite IDE for this purpose, or use out-of-tree build, or Ninja, ... We just keep it simple here for the purpose of this blog. -*Note*: When configuring with CMake, the FetchContent module will fetch the source code of Slint via git. +_Note_: When configuring with CMake, the FetchContent module will fetch the source code of Slint via git. this may take some time. When building for the first time, the first thing that need to be build is the Slint runtime and compiler, this can take a few minutes. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 53714f15c15..6888f40c816 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.23) project(SlintExamples LANGUAGES CXX) list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/examples/carousel/cpp/CMakeLists.txt b/examples/carousel/cpp/CMakeLists.txt index 6e580e7ae55..2fe4375c77c 100644 --- a/examples/carousel/cpp/CMakeLists.txt +++ b/examples/carousel/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_carousel LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/gallery/CMakeLists.txt b/examples/gallery/CMakeLists.txt index 3f4a5e9036c..3035ee885c3 100644 --- a/examples/gallery/CMakeLists.txt +++ b/examples/gallery/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_gallery LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/iot-dashboard/CMakeLists.txt b/examples/iot-dashboard/CMakeLists.txt index 7fd3e3eee01..e87113e7126 100644 --- a/examples/iot-dashboard/CMakeLists.txt +++ b/examples/iot-dashboard/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_iot_dashboard LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/memory/CMakeLists.txt b/examples/memory/CMakeLists.txt index 1218cda247b..c7c5b8c68f0 100644 --- a/examples/memory/CMakeLists.txt +++ b/examples/memory/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.23) project(memory LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/opengl_underlay/CMakeLists.txt b/examples/opengl_underlay/CMakeLists.txt index a6f97a71da1..58ae82c7186 100644 --- a/examples/opengl_underlay/CMakeLists.txt +++ b/examples/opengl_underlay/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(opengl_cpp_underlay LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/printerdemo/cpp/CMakeLists.txt b/examples/printerdemo/cpp/CMakeLists.txt index 919d40cd8de..f11e383df17 100644 --- a/examples/printerdemo/cpp/CMakeLists.txt +++ b/examples/printerdemo/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_printer_demo LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/printerdemo/cpp_interpreted/CMakeLists.txt b/examples/printerdemo/cpp_interpreted/CMakeLists.txt index bc791817070..7da9b97a000 100644 --- a/examples/printerdemo/cpp_interpreted/CMakeLists.txt +++ b/examples/printerdemo/cpp_interpreted/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_interpreter_printer_demo LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/printerdemo_old/cpp/CMakeLists.txt b/examples/printerdemo_old/cpp/CMakeLists.txt index 3eb71a3989b..730f1d54bad 100644 --- a/examples/printerdemo_old/cpp/CMakeLists.txt +++ b/examples/printerdemo_old/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) if (NOT TARGET Slint::Slint) find_package(Slint REQUIRED) diff --git a/examples/qt_viewer/CMakeLists.txt b/examples/qt_viewer/CMakeLists.txt index 435c23e0c05..281b8eaae2c 100644 --- a/examples/qt_viewer/CMakeLists.txt +++ b/examples/qt_viewer/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(qt_viewer LANGUAGES CXX) if (NOT TARGET Slint::Slint) diff --git a/examples/todo/cpp/CMakeLists.txt b/examples/todo/cpp/CMakeLists.txt index 0606d248191..6c9f195b390 100644 --- a/examples/todo/cpp/CMakeLists.txt +++ b/examples/todo/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright © SixtyFPS GmbH # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.23) project(slint_cpp_todo LANGUAGES CXX) if (NOT TARGET Slint::Slint)