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