[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=950fcdc

The following commit has been merged in the master branch:
commit 950fcdc13175c4c2dcf68886ee9b8e4e91d38366
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Feb 24 17:05:15 2015 +0000

    #1032.  Thanks very much to Daniel for his help with this.
---
 CMakeLists.txt         | 2 ++
 config/CMakeChecks.txt | 1 +
 src/svn_version.h.in   | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1915961..d9372d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,8 @@ IF(SUBVERSION_FOUND)
         SET(SVN_REVISION "${svnExiv2_WC_REVISION}")
     ENDIF()
 ENDIF()
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h.in
+                ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h @ONLY)
 MESSAGE(STATUS  "SVN version:  ${SVN_REVISION}")
 
 IF( NOT MSVC )
diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 266cca1..d7502d8 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -275,6 +275,7 @@ CONFIGURE_FILE( config/config.h.cmake ${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf
 CONFIGURE_FILE( config/exv_msvc.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/exv_msvc.h COPYONLY )
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h DESTINATION include/exiv2 )
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/include/exiv2/exv_msvc.h DESTINATION include/exiv2 )
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/src/svn_version.h        DESTINATION include/exiv2 )
 
 CONFIGURE_FILE(config/exiv2_uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
 ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
diff --git a/src/svn_version.h.in b/src/svn_version.h.in
index fb71ccf..c446119 100644
--- a/src/svn_version.h.in
+++ b/src/svn_version.h.in
@@ -1 +1,3 @@
-#define SVN_VERSION @SVN_REVISION@
\ No newline at end of file
+#ifndef SVN_VERSION
+#define SVN_VERSION @SVN_REVISION@
+#endif

-- 
exiv2 packaging