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

The following commit has been merged in the master branch:
commit d665a0123bb54d8ebbeca0d4f155177c75910915
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 5 01:09:45 2012 +0000

    Adding Gilles' FindExiv2.cmake.  Adding a pre-build header copy modify sample include path.
---
 FindExiv2.cmake        | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 samples/CMakeLists.txt |  2 +-
 src/CMakeLists.txt     |  8 +++++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/FindExiv2.cmake b/FindExiv2.cmake
new file mode 100755
index 0000000..f929269
--- /dev/null
+++ b/FindExiv2.cmake
@@ -0,0 +1,80 @@
+# - Try to find the Exiv2 library
+#
+#  EXIV2_MIN_VERSION - You can set this variable to the minimum version you need
+#                      before doing FIND_PACKAGE(Exiv2). The default is 0.12.
+#
+# Once done this will define
+#
+#  EXIV2_FOUND - system has libexiv2
+#  EXIV2_INCLUDE_DIR - the libexiv2 include directory
+#  EXIV2_LIBRARIES - Link these to use libexiv2
+#  EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
+#
+# The minimum required version of Exiv2 can be specified using the
+# standard syntax, e.g. find_package(Exiv2 0.17)
+#
+# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
+# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
+
+# Copyright (c) 2010, Alexander Neundorf, <neundorf at kde.org>
+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles at gmail.com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# Support EXIV2_MIN_VERSION for compatibility:
+if(NOT Exiv2_FIND_VERSION)
+  set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}")
+endif(NOT Exiv2_FIND_VERSION)
+
+# the minimum version of exiv2 we require
+if(NOT Exiv2_FIND_VERSION)
+  set(Exiv2_FIND_VERSION "0.12")
+endif(NOT Exiv2_FIND_VERSION)
+
+
+if (NOT WIN32)
+   # use pkg-config to get the directories and then use these values
+   # in the FIND_PATH() and FIND_LIBRARY() calls
+   find_package(PkgConfig)
+   pkg_check_modules(PC_EXIV2 QUIET exiv2)
+   set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER})
+endif (NOT WIN32)
+
+
+find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp
+          HINTS
+          ${PC_EXIV2_INCLUDEDIR}
+          ${PC_EXIV2_INCLUDE_DIRS}
+        )
+
+find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2
+             HINTS
+             ${PC_EXIV2_LIBDIR}
+             ${PC_EXIV2_LIBRARY_DIRS}
+            )
+
+
+# Get the version number from exiv2/version.hpp and store it in the cache:
+if(EXIV2_INCLUDE_DIR  AND NOT  EXIV2_VERSION)
+  file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
+  string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\( *([0-9]+) *\)"  _dummy "${EXIV2_VERSION_CONTENT}")
+  set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
+  string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\( *([0-9]+) *\)"  _dummy "${EXIV2_VERSION_CONTENT}")
+  set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
+
+  string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\( *([0-9]+) *\)"  _dummy "${EXIV2_VERSION_CONTENT}")
+  set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
+
+  set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE)
+endif(EXIV2_INCLUDE_DIR  AND NOT  EXIV2_VERSION)
+
+set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Exiv2  REQUIRED_VARS  EXIV2_LIBRARY EXIV2_INCLUDE_DIR
+                                         VERSION_VAR  EXIV2_VERSION)
+
+mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
+
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 4fb0c31..d7a8d88 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -8,7 +8,7 @@
 if (MSVC)
 	include(../CMake_msvc.txt)
 	msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
-	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
+	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
 	
 	if ( NOT EXIV2_ENABLE_SHARED )		
 		link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.7/$(ConfigurationName))
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a6ebf3..6f25612 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -219,6 +219,14 @@ IF( ICONV_FOUND )
 	TARGET_LINK_LIBRARIES( exiv2 ${ICONV_LIBRARIES} )
 ENDIF( ICONV_FOUND )
 
+IF (MSVC )
+    ADD_CUSTOM_COMMAND(
+      TARGET exiv2
+      PRE_BUILD
+      COMMAND if NOT exist ..\include mkdir ..\include
if NOT exist ..\include\exiv2 (
mkdir ..\include\exiv2
copy /y ..\src\*.h ..\include\exiv2
copy /y ..\src\*.hpp ..\include\exiv2
)
+    )
+ENDIF()
+
 ##
 # copy zlib and expat dlls to output directory if necessary
 IF ( MSVC AND EXIV2_ENABLE_SHARED )

-- 
exiv2 packaging