mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
065a80c011
* gnu/packages/patches/dolphin-emu-unbundle-watcher.patch: Simplify since our watcher package now ships pkg-config files. Change-Id: Ia1456be28a9a20f8a2d1658499e1be241bd80f34
30 lines
878 B
Diff
30 lines
878 B
Diff
Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13823
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c277e2a10a..9b9ec00f91 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -786,7 +786,9 @@ if (USE_RETRO_ACHIEVEMENTS)
|
|
add_subdirectory(Externals/rcheevos)
|
|
endif()
|
|
|
|
-add_subdirectory(Externals/watcher)
|
|
+dolphin_find_optional_system_library_pkgconfig(
|
|
+ WATCHER watcher watcher::watcher Externals/watcher
|
|
+)
|
|
|
|
########################################
|
|
# Pre-build events: Define configuration variables and write SCM info header
|
|
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
|
|
index ee738ba4e3..629c739c8d 100644
|
|
--- a/Source/Core/Common/CMakeLists.txt
|
|
+++ b/Source/Core/Common/CMakeLists.txt
|
|
@@ -186,7 +186,7 @@ PRIVATE
|
|
FatFs
|
|
Iconv::Iconv
|
|
spng::spng
|
|
- watcher
|
|
+ watcher::watcher
|
|
${VTUNE_LIBRARIES}
|
|
)
|
|
|