blob: 7c8613db5e8207ed4cd30fdeec4c60d91d125767 (
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
85
86
87
88
89
90
91
92
93
94
95
96
97
|
Index: a/samples/CMakeLists.txt
===================================================================
--- a/samples/CMakeLists.txt (revision 3972)
+++ b/samples/CMakeLists.txt (revision 3973)
@@ -52,7 +52,7 @@
STRING( REPLACE ".cpp" "" target ${entry})
ADD_EXECUTABLE( ${target} ${target}.cpp )
ADD_TEST( ${target}_test ${target} )
- TARGET_LINK_LIBRARIES( ${target} exiv2lib )
+ TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${EXPAT_LIBRARIES})
#INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
ENDFOREACH(entry ${SAMPLES})
Index: a/src/CMakeLists.txt
===================================================================
--- a/src/CMakeLists.txt (revision 3972)
+++ b/src/CMakeLists.txt (revision 3973)
@@ -240,20 +240,20 @@
if ( MSVC )
source_group("Header Files" FILES ${LIBEXIV2_HDR} )
- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} )
source_group("Header Files" FILES ${LIBCURL_HDR} )
- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} )
source_group("Header Files" FILES ${SSH_HDR} )
- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} )
else()
if ( NOT MINGW )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} )
else()
- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} )
endif()
endif()
@@ -262,33 +262,33 @@
if ( MSVC )
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
endif(MSVC)
- TARGET_LINK_LIBRARIES( exiv2lib xmp )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE xmp )
ENDIF()
IF( EXIV2_ENABLE_PNG )
IF( ZLIB_FOUND )
IF( MSVC )
if ( EXIV2_ENABLE_SHARED )
- TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES} debug ${ZLIB_LIBRARIES}d )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib )
else()
- TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized zlibstatic.lib debug zlibstaticd.lib )
endif()
ELSE()
- TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} )
ENDIF()
ENDIF()
ENDIF()
IF( EXIV2_ENABLE_NLS )
- TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} )
ENDIF( EXIV2_ENABLE_NLS )
IF( ICONV_FOUND )
- TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} )
ENDIF( ICONV_FOUND )
IF (CYGWIN OR MINGW)
- TARGET_LINK_LIBRARIES( exiv2lib psapi )
+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi )
ENDIF(CYGWIN OR MINGW)
@@ -303,7 +303,7 @@
# ******************************************************************************
# connection test application
ADD_EXECUTABLE( conntest ${CONNTEST} )
-TARGET_LINK_LIBRARIES( conntest exiv2lib )
+TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES})
# ******************************************************************************
# exifprint application
|
GitWeb