[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:20 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=91bfda3
The following commit has been merged in the master branch:
commit 91bfda349d0fdc5a6bef8015852d27e129b686aa
Author: Robin Mills <robin at clanmills.com>
Date: Wed Jan 25 18:33:29 2017 +0000
#1273 Correction to r4699
---
src/CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3d57af..9a284a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -246,10 +246,15 @@ SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
OUTPUT_NAME exiv2
)
+string( TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME )
+
IF ( UNIX )
IF ( NOT CYGWIN AND NOT MINGW )
SET (LINUX 1)
ENDIF()
+ IF ( SYSTEM_NAME EQUAL "freebsd" )
+ SET (FREEBSD 1)
+ ENDIF()
ENDIF()
if ( MSVC )
@@ -261,7 +266,7 @@ if ( MSVC )
source_group("Header Files" FILES ${SSH_HDR} )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
else()
- if ( MINGW OR CYGWIN )
+ if ( UNIX AND NOT FREEBSD )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
@@ -305,7 +310,6 @@ IF (CYGWIN OR MINGW)
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} psapi ws2_32 )
ENDIF(CYGWIN OR MINGW)
-
INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
include(../CMake_msvc.txt)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list