Updgrade Catch2 dependency (#8846)
Some checks failed
autofix.ci / format_fix (push) Has been cancelled
autofix.ci / lint_typecheck (push) Has been cancelled
CI / files-changed (push) Has been cancelled
CI / ffi_32bit_build (push) Has been cancelled
CI / build_and_test (--exclude ffmpeg --exclude gstreamer-player, macos-14, stable) (push) Has been cancelled
CI / build_and_test (--exclude ffmpeg --exclude gstreamer-player, windows-2022, 1.85) (push) Has been cancelled
CI / build_and_test (--exclude ffmpeg --exclude gstreamer-player, windows-2022, beta) (push) Has been cancelled
CI / build_and_test (--exclude ffmpeg --exclude gstreamer-player, windows-2022, stable) (push) Has been cancelled
CI / build_and_test (ubuntu-22.04, 1.85) (push) Has been cancelled
CI / build_and_test (ubuntu-22.04, nightly) (push) Has been cancelled
CI / node_test (macos-14) (push) Has been cancelled
CI / node_test (ubuntu-22.04) (push) Has been cancelled
CI / node_test (windows-2022) (push) Has been cancelled
CI / python_test (macos-14) (push) Has been cancelled
CI / python_test (ubuntu-22.04) (push) Has been cancelled
CI / python_test (windows-2022) (push) Has been cancelled
CI / cpp_test_driver (macos-13) (push) Has been cancelled
CI / cpp_test_driver (ubuntu-22.04) (push) Has been cancelled
CI / cpp_test_driver (windows-2022) (push) Has been cancelled
CI / docs (push) Has been cancelled
CI / cpp_cmake (macos-14, 1.85) (push) Has been cancelled
CI / cpp_cmake (ubuntu-22.04, stable) (push) Has been cancelled
CI / cpp_cmake (windows-2022, nightly) (push) Has been cancelled
CI / cpp_package_test (push) Has been cancelled
CI / wasm (push) Has been cancelled
CI / wasm_demo (push) Has been cancelled
CI / vsce_build_test (push) Has been cancelled
CI / mcu (pico-st7789, thumbv6m-none-eabi) (push) Has been cancelled
CI / mcu (pico2-st7789, thumbv8m.main-none-eabihf) (push) Has been cancelled
CI / mcu (stm32h735g, thumbv7em-none-eabihf) (push) Has been cancelled
CI / mcu-embassy (push) Has been cancelled
CI / tree-sitter (push) Has been cancelled
CI / updater_test (0.3.0) (push) Has been cancelled
CI / fmt_test (push) Has been cancelled
CI / esp-idf-quick (push) Has been cancelled
CI / android (push) Has been cancelled
CI / miri (push) Has been cancelled
CI / test-figma-inspector (push) Has been cancelled

CMake 4.0 remove some deprecated code < 3.5 

Catch2 old version still depend against cmake 3.0 + deprecated method.
Necessary to increase version otherwise when we try to compile
example with cmake 4.0 it will failed to configure it
This commit is contained in:
Montel Laurent 2025-07-05 08:54:24 +02:00 committed by GitHub
parent b4186e6648
commit 301892d008
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 12 additions and 12 deletions

View file

@ -4,7 +4,7 @@
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.8
GIT_TAG v3.8.0
)
FetchContent_MakeAvailable(Catch2)
@ -13,7 +13,7 @@ find_package(Threads REQUIRED)
macro(slint_test NAME)
add_executable(test_${NAME} ${NAME}.cpp)
target_link_libraries(test_${NAME} PRIVATE Slint Catch2::Catch2)
target_link_libraries(test_${NAME} PRIVATE Slint Catch2::Catch2WithMain)
target_compile_definitions(test_${NAME} PRIVATE
SOURCE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/\"
)

View file

@ -4,7 +4,7 @@
#include <ranges>
#include <chrono>
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>

View file

@ -4,7 +4,7 @@
// cSpell: ignore singleshot
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>
#include <thread>

View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>
#include <slint-interpreter.h>

View file

@ -4,7 +4,7 @@
#include <chrono>
#include <memory>
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>

View file

@ -4,7 +4,7 @@
// cSpell: ignore singleshot
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint-platform.h>
#include <thread>

View file

@ -3,7 +3,7 @@
#include <chrono>
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>
#include <slint_image.h>

View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>
#include <slint-interpreter.h>

View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
#include <slint.h>
#include <thread>

View file

@ -17,6 +17,6 @@ target_link_libraries(todo PRIVATE todo_lib)
if(SLINT_BUILD_TESTING AND SLINT_FEATURE_TESTING AND SLINT_FEATURE_EXPERIMENTAL)
add_executable(test_todo_basic tests/test_todo_basic.cpp)
target_link_libraries(test_todo_basic PRIVATE Catch2::Catch2 todo_lib)
target_link_libraries(test_todo_basic PRIVATE Catch2::Catch2WithMain todo_lib)
add_test(NAME test_todo_basic COMMAND test_todo_basic)
endif()

View file

@ -5,7 +5,7 @@
#include "../app.h"
#define CATCH_CONFIG_MAIN
#include "catch2/catch.hpp"
#include "catch2/catch_all.hpp"
SCENARIO("Basic TEST")
{