blob: a67910ef5709f50eb86302d2e3f92ddbfaf49f9e (
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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2188f97..93e6a34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,8 +124,6 @@ include(WindowsSupport)
# Orthogonal features
include(LibraryFeatures)
-# pkg-config support
-include(PkgConfig)
# math.h/libm portability
find_package(CMath REQUIRED)
@@ -156,6 +154,8 @@ add_subdirectory(man)
add_subdirectory(html)
endif()
+# pkg-config support
+include(PkgConfig)
message(STATUS "")
message(STATUS "Libtiff is now configured for ${CMAKE_SYSTEM}")
diff --git a/libtiff-4.pc.in b/libtiff-4.pc.in
index abe75a6..8899725 100644
--- a/libtiff-4.pc.in
+++ b/libtiff-4.pc.in
@@ -5,7 +5,8 @@ includedir=@includedir@
Name: libtiff
Description: Tag Image File Format (TIFF) library.
-Version: @VERSION@
+Version: @LIBTIFF_VERSION_FULL@
Libs: -L${libdir} -ltiff
Libs.private: @tiff_libs_private@
Cflags: -I${includedir}
+Requires.private: @tiff_requires_private@
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
index db5f140..6db71ee 100755
--- a/libtiff/CMakeLists.txt
+++ b/libtiff/CMakeLists.txt
@@ -106,14 +106,19 @@ target_include_directories(tiff
${TIFF_INCLUDES}
)
+set(tiff_libs_private "")
+set(tiff_requires_private "")
+
if(ZIP_SUPPORT)
target_link_libraries(tiff PRIVATE ZLIB::ZLIB)
+ string(APPEND tiff_requires_private " zlib")
endif()
if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
target_link_libraries(tiff PRIVATE Deflate::Deflate)
endif()
if(JPEG_SUPPORT)
target_link_libraries(tiff PRIVATE JPEG::JPEG)
+ string(APPEND tiff_requires_private " libjpeg")
if(JPEG_DUAL_MODE_8_12)
target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR})
target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES})
@@ -127,14 +132,23 @@ if(LERC_SUPPORT)
endif()
if(LZMA_SUPPORT)
target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA)
+ string(APPEND tiff_requires_private " liblzma")
endif()
if(ZSTD_SUPPORT)
target_link_libraries(tiff PRIVATE ZSTD::ZSTD)
+ string(APPEND tiff_requires_private " libzstd")
endif()
if(WEBP_SUPPORT)
target_link_libraries(tiff PRIVATE WebP::WebP)
+ string(APPEND tiff_requires_private " libwebp")
endif()
target_link_libraries(tiff PRIVATE CMath::CMath)
+if(CMath_LIBRARY)
+ string(APPEND tiff_libs_private " -lm")
+endif()
+
+set(tiff_libs_private "${tiff_libs_private}" PARENT_SCOPE)
+set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE)
set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION})
if(NOT CYGWIN)
|
