[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=27080fe

The following commit has been merged in the master branch:
commit 27080fe98661029810e57d34f28666a8103571e4
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jul 17 21:42:08 2014 +0000

    Fix CMake to execute the script src/svn_version.h (which generates the SVN support for Exiv2 -v -V).
    Thanks to Mahesh for discovering this and letting me know.
---
 CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4a946d..44fb2a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,9 +165,10 @@ IF( EXIV2_ENABLE_BUILD_PO )
 ENDIF( EXIV2_ENABLE_BUILD_PO )
 
 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)
+  # 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 )
@@ -175,6 +176,9 @@ IF( NOT MSVC )
   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 )
+  
+  MESSAGE(STATUS         "generating ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h")
+  EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src       COMMAND ./svn_version.sh)
 ENDIF()
 
 ##

-- 
exiv2 packaging