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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:46:32 UTC 2017


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

The following commit has been merged in the master branch:
commit 8d59b040422ad252eeb477e1fef5e9f4fc66e5cd
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jun 18 14:06:03 2016 +0000

    #1041 CMake/MinGW fix.  I have never persuaded CMake/MinGW to work.
---
 src/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c685713..fec7e82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -223,8 +223,10 @@ ENDIF( MSVC )
 
 ##
 # msvn tuning
-include(../CMake_msvc.txt)
-msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+IF( MSVC )
+    include(../CMake_msvc.txt)
+    msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
+ENDIF( MSVC )
 
 # ******************************************************************************
 # exiv2lib library
@@ -238,7 +240,7 @@ SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
     OUTPUT_NAME   exiv2
 )
 
-IF ( UNIX ) 
+IF ( UNIX )
   IF ( NOT CYGWIN AND NOT MINGW )
     SET (LINUX 1)
   ENDIF()

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list