Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump lib/WinToast from 5e441fd to e52e914 #4891

Closed

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 13, 2023

Bumps lib/WinToast from 5e441fd to e52e914.

Commits
  • e52e914 Adding Waterfox to the list of tools using this library
  • 717e663 Firing notifications from non-admin accounts in elevated context planned in v...
  • c157282 Firing notifications from the ActionCenter planned for version 1.4.0
  • 9c218a4 Scheduling feature to reuse AUMI from current process in version 1.4.0
  • c417764 Updating the feature request document to keep track
  • ce6c6c4 Adding a simple file to keep track of feature requests
  • bbbb0bf Fixing README documentation regarding the failures when calling showToast
  • 42dbb68 Updating license.txt to add information about the version number
  • 0d9a1e3 Merge pull request #84 from YairBorn/patch-1
  • 674e734 Update README.md
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [lib/WinToast](https://github.com/mohabouje/WinToast) from `5e441fd` to `e52e914`.
- [Release notes](https://github.com/mohabouje/WinToast/releases)
- [Commits](mohabouje/WinToast@5e441fd...e52e914)

---
updated-dependencies:
- dependency-name: lib/WinToast
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added ci Issues related to the ci submodules Issues related to updating submodules with dependabot labels Oct 13, 2023
@Nerixyz
Copy link
Contributor

Nerixyz commented Oct 13, 2023

WinToast added CMake support 🎉 let's use it!

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/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)

This adds a warning when using CMake 3.27 or later, which I fixed in mohabouje/WinToast#88.

@pajlada
Copy link
Member

pajlada commented Oct 13, 2023

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Oct 13, 2023

Superseded by #4894.

@dependabot dependabot bot closed this Oct 13, 2023
@dependabot dependabot bot deleted the dependabot/submodules/lib/WinToast-e52e914 branch October 13, 2023 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Issues related to the ci submodules Issues related to updating submodules with dependabot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants