blob: 4d03ed02d7dc31b9d98c025fa6ce2da46bdf0d72 (
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
44
45
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 133523b4..0c754c6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,7 @@ if (ENABLE_DECOMPRESSION)
#message(STATUS "In ENABLE_DECOMPRESSION setup: TRUE")
# Zlib and ZSTD need to be found otherwise disable it
if(NOT TARGET ZLIB::ZLIB)
- find_package(ZLIB)
+ find_package(ZLIB REQUIRED)
else()
# Presumably in this case, the target has been found externally but set this flag just in case
set(ZLIB_FOUND TRUE)
@@ -203,7 +203,7 @@ if (ENABLE_DECOMPRESSION)
TARGET ZSTD::ZSTD
)
)
- find_package(zstd)
+ find_package(zstd CONFIG REQUIRED)
else()
# Presumably in this case, the target has been found externally but set this flag just in case
set(zstd_FOUND TRUE)
diff --git a/src/lib/libdwarf/cmake/libdwarfConfig.cmake.in b/src/lib/libdwarf/cmake/libdwarfConfig.cmake.in
index 567bcf3..888b801 100644
--- a/src/lib/libdwarf/cmake/libdwarfConfig.cmake.in
+++ b/src/lib/libdwarf/cmake/libdwarfConfig.cmake.in
@@ -7,7 +7,7 @@ if(LIBDWARF_BUILT_WITH_ZLIB_AND_ZSTD)
find_dependency(ZLIB)
set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
- find_dependency(zstd)
+ find_dependency(zstd CONFIG)
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}")
unset(CMAKE_MODULE_PATH_OLD)
endif()
diff --git a/src/lib/libdwarf/libdwarf.pc.in b/src/lib/libdwarf/libdwarf.pc.in
index 1d78dbb..3bb9178 100644
--- a/src/lib/libdwarf/libdwarf.pc.in
+++ b/src/lib/libdwarf/libdwarf.pc.in
@@ -9,4 +9,5 @@ Description: DWARF debug symbols library
Version: @PROJECT_VERSION@
Libs: -L${libdir} -ldwarf
Cflags: -I${includedir}
+Requires.private: zlib libzstd
|
