~ruther/guix-local

ref: next-master guix-local/gnu/packages/patches/jami-qwindowkit.patch -rw-r--r-- 1.2 KiB
b989e013 — Andy Tai gnu: koboldcpp: Update to 1.106.2. 30 days ago 
                                                                                
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

Upstream-status: <https://review.jami.net/c/jami-client-qt/+/31456>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c046b597..366758f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,13 +101,13 @@ endif()
 
 # qwindowkit (frameless window)
 add_fetch_content(
-  TARGET qwindowkit
+  TARGET QWindowKit
   URL https://github.com/stdware/qwindowkit.git
   BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
   PATCHES ${QWINDOWKIT_PATCHES}
   OPTIONS ${QWINDOWKIT_OPTIONS}
 )
-list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
+
 list(APPEND CLIENT_LIBS QWindowKit::Quick)
 
 # If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a1aeb22f..94f558e0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -61,7 +61,7 @@ target_include_directories(test_common_obj PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src)
 target_link_directories(test_common_obj PRIVATE ${CLIENT_LINK_DIRS})
-target_link_libraries(test_common_obj ${QML_TEST_LIBS})
+target_link_libraries(test_common_obj ${QML_TEST_LIBS} ${CLIENT_LIBS})
 target_compile_definitions(test_common_obj PRIVATE BUILD_TESTING="ON")
 
 set(COMMON_TESTS_SOURCES