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

The following commit has been merged in the master branch:
commit b45394b782c8dd223035e62064d41358c4d95728
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 21 15:22:34 2016 +0000

    #1109 CMake changes for MinGW.  I have not yet succeeded in get CMake/MinGW to work.
---
 CMakeLists.txt | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f2c836..b315e3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,5 @@
 # CMake build system for exiv2 library and executables
 # Copyright 2015-     Daniel Kaneider  <danielkaneider at users.sf.net>
-# Copyright 2012-     Robin Mills      <robin at clanmills.com>
 # Copyright 2010-2012 Gilles Caulier   <caulier dot gilles at gmail dot com>
 # Copyright 2008      Patrick Spendrin <ps_ml at gmx dot de>
 
@@ -76,6 +75,7 @@ IF( MINGW OR UNIX )
                     -W
                    )
     ENDIF()
+    ADD_DEFINITIONS( -std=c++98 )
 ENDIF( MINGW OR UNIX )
 
 IF( EXIV2_ENABLE_COMMERCIAL )
@@ -147,11 +147,13 @@ ENDIF()
 
 SET(SVN_REVISION "0")
 IF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
+  IF(NOT MINGW)
     FIND_PACKAGE(Subversion QUIET)
     IF(SUBVERSION_FOUND)
         Subversion_WC_INFO(${PROJECT_SOURCE_DIR} svnExiv2)
         SET(SVN_REVISION "${svnExiv2_WC_REVISION}")
     ENDIF()
+  ENDIF()
 ENDIF()
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h.in
@@ -159,17 +161,19 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h.in
 MESSAGE(STATUS  "SVN version:  ${SVN_REVISION}")
 
 IF( NOT MSVC )
-  # Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2
-  # do not use CREATE_SYMLINK or CMAKE_CAN_SYMLINK as they don't work on CYGWIN
-  EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}           COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
-
-  IF( EXIV2_ENABLE_BUILD_SAMPLES )
-    EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/samples COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
-  ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
-
-  IF( EXIV2_ENABLE_BUILD_PO )
-    EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/po      COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
-  ENDIF( EXIV2_ENABLE_BUILD_PO )
+  IF ( NOT MINGW )
+    # Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2
+    # do not use CREATE_SYMLINK or CMAKE_CAN_SYMLINK as they don't work on CYGWIN
+    EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}           COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
+
+    IF( EXIV2_ENABLE_BUILD_SAMPLES )
+      EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/samples COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
+    ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
+
+    IF( EXIV2_ENABLE_BUILD_PO )
+      EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/po      COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
+    ENDIF( EXIV2_ENABLE_BUILD_PO )
+  ENDIF()
 ENDIF()
 
 ADD_SUBDIRECTORY( xmpsdk )

-- 
exiv2 packaging