[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=4c236fc

The following commit has been merged in the master branch:
commit 4c236fce17e82d2093bc32edc705fb0bda9a7f90
Author: danielkaneider <kaneiderdaniel at gmail.com>
Date:   Tue Dec 29 20:10:56 2015 +0000

    #1041. cmakeBuild with static compilation
---
 contrib/cmake/msvc/cmakeBuild.cmd | 5 ++++-
 samples/CMakeLists.txt            | 5 +++++
 src/CMakeLists.txt                | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 667925d..e50b94e 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -271,15 +271,18 @@ pushd        "%EXIV_B%"
     set ENABLE_LIBSSH=-DEXIV2_ENABLE_SSH=OFF
     set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=OFF
     set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=OFF
+	set ENABLE_SHARED=ON
 
     if defined _CURL_     set ENABLE_CURL=-DEXIV2_ENABLE_CURL=ON
     if defined _LIBSSH_   set ENABLE_SSH=-DEXIV2_ENABLE_SSH=ON
     if defined _WEBREADY_ set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=ON
     if defined _VIDEO_    set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=ON
+	if /I "%_MODE_%" == "static" set ENABLE_SHARED=OFF
+
 
     call:run cmake -G "%_GENERATOR_%" -DCMAKE_BUILD_TYPE=%_CONFIG_% %_LINK_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% ^
               -DEXIV2_ENABLE_NLS=OFF                -DEXIV2_ENABLE_BUILD_SAMPLES=ON ^
-              -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=ON ^
+              -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=%ENABLE_SHARED% ^
               %ENABLE_WEBREADY%  %ENABLE_CURL%  %ENABLE_LIBSSH% %ENABLE_VIDEO% ^
              "%_EXIV2_%"
 
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 6b07398..7476ea3 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -39,6 +39,11 @@ SET( SAMPLES addmoddel.cpp
              xmpsample.cpp
    )
 
+##
+# msvn tuning
+include(../CMake_msvc.txt)
+msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+
 FOREACH(entry ${SAMPLES})
     STRING( REPLACE ".cpp" "" target ${entry})
     ADD_EXECUTABLE( ${target} ${target}.cpp )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b303c5..ce6b91f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -287,6 +287,9 @@ ENDIF(CYGWIN OR MINGW)
 
 INSTALL( TARGETS exiv2lib ${INSTALL_TARGET_STANDARD_ARGS} )
 
+include(../CMake_msvc.txt)
+msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+
 # ******************************************************************************
 # exiv2 application
 ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )

-- 
exiv2 packaging