mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
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 <rasmus.karlsson@pajlada.com> Co-authored-by: nerix <nero.9@hotmail.de>
This commit is contained in:
parent
21427e0dc5
commit
cbc2d3d683
|
@ -120,7 +120,7 @@ endif ()
|
||||||
message(STATUS "Qt version: ${Qt${MAJOR_QT_VERSION}_VERSION}")
|
message(STATUS "Qt version: ${Qt${MAJOR_QT_VERSION}_VERSION}")
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
find_package(WinToast REQUIRED)
|
add_subdirectory(lib/WinToast EXCLUDE_FROM_ALL)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
find_package(Sanitizers QUIET)
|
find_package(Sanitizers QUIET)
|
||||||
|
|
|
@ -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 ()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5e441fd03543b999edb663caf8df7be37c0d575c
|
Subproject commit 821c4818ade1aa4da56ac753285c159ce26fd597
|
|
@ -948,7 +948,7 @@ if (UNIX)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (WinToast_FOUND)
|
if (WIN32)
|
||||||
target_link_libraries(${LIBRARY_PROJECT}
|
target_link_libraries(${LIBRARY_PROJECT}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
WinToast)
|
WinToast)
|
||||||
|
|
Loading…
Reference in a new issue