[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=a0aee65

The following commit has been merged in the master branch:
commit a0aee652ab7ea81f5b809eb517ec2ed651d8bf4e
Author: danielkaneider <kaneiderdaniel at gmail.com>
Date:   Sun Jun 14 10:35:40 2015 +0000

    cmake: add curl support for windows
---
 CMakeLists.txt       |  2 +-
 build/msvc/build.cmd | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39609c8..d03e9b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ if( MSVC )
         include_directories( ${EXPAT_INCLUDE_DIR} msvc64\include src\include)
     endif()
 
-    # FIND_PACKAGE(CURL)
+    FIND_PACKAGE(CURL)
     if ( NOT CURL_FOUND )
         set(CURL_LIBRARY       ${CMAKE_SOURCE_DIR}/../${C}/$(ConfigurationName)/curl)
         set(CURL_INCLUDE_DIR   ${CMAKE_SOURCE_DIR}/../${C})
diff --git a/build/msvc/build.cmd b/build/msvc/build.cmd
index b09886c..ab8d63b 100644
--- a/build/msvc/build.cmd
+++ b/build/msvc/build.cmd
@@ -9,6 +9,9 @@ REM ---------------------------------------------------
 rem  https://github.com/madler/zlib/commits
 SET ZLIB_COMMIT_LONG=50893291621658f355bc5b4d450a8d06a563053d
 
+rem https://github.com/bagder/curl
+SET CURL_COMMIT_LONG=dd39a671019d713bd077be9eed511c2dc6013598
+
 ml64.exe > NUL
 IF ERRORLEVEL 1 (
 	set Platform=Win32
@@ -97,6 +100,7 @@ IF NOT EXIST %INSTALL_DIR% (
 )
 
 
+
 SET ZLIB_COMMIT=%ZLIB_COMMIT_LONG:~0,7%
 IF NOT EXIST %TEMP_DIR%\zlib-%ZLIB_COMMIT%.zip (
 	%CYGWIN_DIR%in\wget.exe -O %TEMP_DIR%/zlib-%ZLIB_COMMIT%.zip --no-check-certificate http://github.com/madler/zlib/zipball/%ZLIB_COMMIT_LONG%
@@ -142,10 +146,38 @@ IF NOT EXIST expat-2.1.0.build (
 	popd
 )
 
+
+
+
+SET CURL_COMMIT=%CURL_COMMIT_LONG:~0,7%
+IF NOT EXIST %TEMP_DIR%
-- 
exiv2 packaging