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

The following commit has been merged in the master branch:
commit ff908547a5d425998bbd7db7d0114901c88a42cd
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Sep 23 06:49:11 2010 +0000

    fix typo in cmake script. patch from Nikolai Saoukh
---
 CMakeLists.txt               | 4 ++--
 config/ConfigureChecks.cmake | 2 +-
 src/CMakeLists.txt           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d56a71..86bcaf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,6 @@ IF( EXIV2_ENABLE_BUILD_SAMPLES )
     ADD_SUBDIRECTORY( samples )
 ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
 
-IF( EXIV2_BUILD_PO )
+IF( EXIV2_ENABLE_BUILD_PO )
     ADD_SUBDIRECTORY( po )
-ENDIF( EXIV2_BUILD_PO )
+ENDIF( EXIV2_ENABLE_BUILD_PO )
diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index e9852a3..79bbe2d 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -276,5 +276,5 @@ OptionOutput( "Conversion of Windows XP tags:      " EXIV2_ENABLE_PRINTUCS2
 OptionOutput( "Nikon lens database:                " EXIV2_ENABLE_LENSDATA           )
 OptionOutput( "Commercial build:                   " EXIV2_ENABLE_COMMERCIAL         )
 OptionOutput( "Build the unit tests:               " EXIV2_ENABLE_BUILD_SAMPLES      )
-OptionOutput( "Building translations files:        " EXIV2_BUILD_PO                  )
+OptionOutput( "Building translations files:        " EXIV2_ENABLE_BUILD_PO           )
 MESSAGE( STATUS "------------------------------------------------------------------" )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a33b8f5..d0bdff8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -172,9 +172,9 @@ IF( MSVC )
 ENDIF( MSVC )
 
 IF( EXIV2_ENABLE_XMP )
-    IF( NOT EXIV2_EXIV2_ENABLE_LIBXMP )
+    IF( NOT EXIV2_ENABLE_LIBXMP )
         SET( LIBEXIV2_SRC ${XMPSRC} ${LIBEXIV2_SRC} )
-    ENDIF( NOT EXIV2_EXIV2_ENABLE_LIBXMP )
+    ENDIF( NOT EXIV2_ENABLE_LIBXMP )
 ENDIF( EXIV2_ENABLE_XMP )
 
 # ******************************************************************************
@@ -188,9 +188,9 @@ SET_TARGET_PROPERTIES( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
 
 TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
 
-if( EXIV2_EXIV2_ENABLE_LIBXMP )
+if( EXIV2_ENABLE_LIBXMP )
     TARGET_LINK_LIBRARIES( exiv2 ${XMPLIB} )
-ENDIF( EXIV2_EXIV2_ENABLE_LIBXMP )
+ENDIF( EXIV2_ENABLE_LIBXMP )
 
 IF( EXIV2_ENABLE_PNG )
     IF( ZLIB_FOUND )

-- 
exiv2 packaging