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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From: Steve Robbins <steve@sumost.ca>
Date: Fri, 30 Jun 2023 22:51:53 -0500
Subject: Link digikamcore lib and tests that use libdng with -latomic.
Forwarded: not-needed
The need for this linking appears to be debian-specific.
---
core/app/DigikamCoreTarget.cmake | 3 ++-
core/tests/dngwriter/CMakeLists.txt | 3 +++
core/tests/rawengine/CMakeLists.txt | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
--- salsa.orig/core/app/DigikamCoreTarget.cmake
+++ salsa/core/app/DigikamCoreTarget.cmake
@@ -184,6 +184,7 @@
opencv_dnn
opencv_ml
opencv_flann
+ atomic
)
if(JXL_FOUND)
@@ -452,7 +453,7 @@
endif()
# Share the install include directory for the 3rdparty plugins
-target_include_directories(digikamcore INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/digikam>")
+target_include_directories(digikamcore PRIVATE atomic INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/digikam>")
### Install Rules ###############################################################################################################
--- salsa.orig/core/tests/dngwriter/CMakeLists.txt
+++ salsa/core/tests/dngwriter/CMakeLists.txt
@@ -21,6 +21,7 @@
libdng
digikamcore
+ atomic
${EXPAT_LIBRARY}
${JXL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
@@ -43,6 +44,7 @@
${COMMON_TEST_LINK}
+ atomic
${EXPAT_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
PNG::PNG # For zlib
@@ -64,6 +66,7 @@
${COMMON_TEST_LINK}
+ atomic
${EXPAT_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
PNG::PNG # For zlib
--- salsa.orig/core/tests/rawengine/CMakeLists.txt
+++ salsa/core/tests/rawengine/CMakeLists.txt
@@ -73,6 +73,7 @@
${LIB_DNG}
${COMMON_TEST_LINK}
+ atomic
)
|
