[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:26 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=fbde188

The following commit has been merged in the master branch:
commit fbde18806db38d51110d349081aa71671082e908
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Oct 6 21:29:40 2012 +0000

    Fix. Issue: #844.  Do not link MSVC builds with library dl.  Thanks Daniel for reporting this
---
 src/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b46911f..66bdd11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -202,10 +202,11 @@ SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
 
 if ( MSVC ) 
 	source_group("Header Files" FILES ${LIBEXIV2_HDR} )
+    TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
+else()
+    TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
 endif()
 
-TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
-
 if( EXIV2_ENABLE_LIBXMP )
 	ADD_DEPENDENCIES( exiv2lib xmp )
 	LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list