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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 85c6a7b1094cf497eb1eb86704a96667234fc7b7
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Nov 9 20:18:35 2015 +0000

    #1041.  Changes discussed with Daniel on Skype.
---
 CMakeLists.txt | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0264ec8..95445ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ OPTION( EXIV2_ENABLE_BUILD_SAMPLES "Build the unit tests"
 OPTION( EXIV2_ENABLE_BUILD_PO      "Build translations files"                              OFF )
 OPTION( EXIV2_ENABLE_VIDEO         "Build video support into library"                      OFF )
 OPTION( EXIV2_ENABLE_WEBREADY      "Build webready support into library"                   OFF )
-OPTION( EXIV2_ENABLE_CURL          "USE Libcurl for HttpIo"                                ON  )
-OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                                  ON  )
+OPTION( EXIV2_ENABLE_CURL          "USE Libcurl for HttpIo"                                OFF )
+OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                                  OFF )
 IF (WIN32)
     OPTION( EXIV2_ENABLE_WIN_UNICODE   "Use Unicode paths (wstring) on Windows"            OFF )
 ENDIF()
@@ -100,31 +100,23 @@ if( MSVC )
 
     ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
 
-    set(E expat-2.1.0)
-    set(Z zlib-1.2.7)
-    set(C curl-7.39.0)
-    set(C libssh-0.5.5)
+    set(E expat)
+    set(Z zlib)
+    set(C curl)
+    set(S libssh)
 
     # link dependent libraries
     FIND_PACKAGE(EXPAT QUIET)
-    if ( NOT EXPAT_LIBRARY  )
-        set(EXPAT_LIBRARY      ${CMAKE_SOURCE_DIR}/../${E}/$(ConfigurationName)/expat)
-        set(EXPAT_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/../${E}/lib)
-        include_directories( ${EXPAT_INCLUDE_DIR} msvc64\include src\include)
+    if ( EXPAT_FOUND )
+    	include_directories( ${EXPAT_INCLUDE_DIR} )
     endif()
-
-    FIND_PACKAGE(CURL)
-    if ( NOT CURL_FOUND )
-        set(CURL_LIBRARY       ${CMAKE_SOURCE_DIR}/../${C}/$(ConfigurationName)/curl)
-        set(CURL_INCLUDE_DIR   ${CMAKE_SOURCE_DIR}/../${C})
+    
+    FIND_PACKAGE(CURL QUIET)
+    if ( CURL_FOUND )
         include_directories( ${CURL_INCLUDE_DIR})
     endif()
 
     FIND_PACKAGE(ZLIB QUIET)
-    if ( NOT ZLIB_FOUND )
-        set(ZLIB_LIBRARY       ${CMAKE_SOURCE_DIR}/../${Z}/$(ConfigurationName)/zlib)
-        set(ZLIB_INCLUDE_DIR   ${CMAKE_SOURCE_DIR}/../${Z})
-    endif()
     include_directories(${ZLIB_INCLUDE_DIR})
 
     if ( EXIV2_ENABLE_SHARED )

-- 
exiv2 packaging