| 1 | This patch has already been upstreamed, see: <https://github.com/crosswire/xiphos/pull/1103>.
|
| 2 | It should be removed once Xiphos updates.
|
| 3 |
|
| 4 | From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001
|
| 5 | From: Jan Tojnar <[email protected]>
|
| 6 | Date: Sat, 15 Jan 2022 05:00:37 +0100
|
| 7 | Subject: [PATCH] Add dbus-glib dependency to main
|
| 8 |
|
| 9 | It is required through the ipc header and the build will fail without it on Nix:
|
| 10 |
|
| 11 | In file included from /build/source/src/main/search_sidebar.cc:48:
|
| 12 | /build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory
|
| 13 | 26 | #include <dbus/dbus-glib.h>
|
| 14 | | ^~~~~~~~~~~~~~~~~~
|
| 15 | compilation terminated.
|
| 16 | ---
|
| 17 | src/main/CMakeLists.txt | 11 +++++++++++
|
| 18 | 1 file changed, 11 insertions(+)
|
| 19 |
|
| 20 | diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
|
| 21 | index 49b86371..bb8e4bb6 100644
|
| 22 | |
| 23 | |
| 24 | @@ -75,7 +75,18 @@ target_link_libraries(main
|
| 25 | PkgConfig::Soup
|
| 26 | PkgConfig::Sword
|
| 27 | PkgConfig::Biblesync
|
| 28 | - )
|
| 29 | +)
|
| 30 | +
|
| 31 | +IF (DBUS)
|
| 32 | + target_include_directories (main
|
| 33 | + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
|
| 34 | + PkgConfig::DBus
|
| 35 | + )
|
| 36 | + target_link_libraries(main
|
| 37 | + PRIVATE
|
| 38 | + PkgConfig::DBus
|
| 39 | + )
|
| 40 | +ENDIF (DBUS)
|
| 41 |
|
| 42 | if(WK_FOUND)
|
| 43 | target_compile_definitions(main
|