From cbc2d3d683ca12730c9120306557c7e0c90a4342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 18:49:12 +0200 Subject: [PATCH] Bump lib/WinToast from `5e441fd` to `821c481` (#4894) This also changes the build method from a custom FindPackage solution to using their cmake file Co-authored-by: Rasmus Karlsson Co-authored-by: nerix --- CMakeLists.txt | 2 +- cmake/FindWinToast.cmake | 12 ------------ lib/WinToast | 2 +- src/CMakeLists.txt | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 cmake/FindWinToast.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b664bf7b..80ded410e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,7 @@ endif () message(STATUS "Qt version: ${Qt${MAJOR_QT_VERSION}_VERSION}") if (WIN32) - find_package(WinToast REQUIRED) + add_subdirectory(lib/WinToast EXCLUDE_FROM_ALL) endif () find_package(Sanitizers QUIET) diff --git a/cmake/FindWinToast.cmake b/cmake/FindWinToast.cmake deleted file mode 100644 index 3b767fb19..000000000 --- a/cmake/FindWinToast.cmake +++ /dev/null @@ -1,12 +0,0 @@ -if (EXISTS ${CMAKE_SOURCE_DIR}/lib/WinToast/src/wintoastlib.cpp) - set(WinToast_FOUND TRUE) - add_library(WinToast ${CMAKE_SOURCE_DIR}/lib/WinToast/src/wintoastlib.cpp) - target_include_directories(WinToast PUBLIC "${CMAKE_SOURCE_DIR}/lib/WinToast/src/") -else () - set(WinToast_FOUND FALSE) - message("WinToast submodule not found!") -endif () - - - - diff --git a/lib/WinToast b/lib/WinToast index 5e441fd03..821c4818a 160000 --- a/lib/WinToast +++ b/lib/WinToast @@ -1 +1 @@ -Subproject commit 5e441fd03543b999edb663caf8df7be37c0d575c +Subproject commit 821c4818ade1aa4da56ac753285c159ce26fd597 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3165cd1fc..ef7fb162a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -948,7 +948,7 @@ if (UNIX) endif () endif () -if (WinToast_FOUND) +if (WIN32) target_link_libraries(${LIBRARY_PROJECT} PUBLIC WinToast)