[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:24 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c05265e
The following commit has been merged in the master branch:
commit c05265e5cf67caf1f01bfdf6f72f45f11fc075e2
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Tue Apr 20 14:37:04 2010 +0000
added new rules to manage translations file.
Code inspired from huggin project.
This use a shell script. this one must be ported to CMake.
---
CMakeLists.txt | 7 ++++++-
config/ConfigureChecks.cmake | 25 +++++++++++++------------
{xmpsdk => po}/CMakeLists.txt | 13 ++++++-------
po/README-CMAKE | 0
src/CMakeLists.txt | 12 ++++++------
5 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a48d976..e12ffd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,13 +46,14 @@ SET( GENERIC_LIB_SOVERSION "6" )
# options and there default values
OPTION( EXIV2_ENABLE_SHARED "Build exiv2 as a shared library (dll)" ON )
OPTION( EXIV2_ENABLE_XMP "Build with XMP metadata support" ON )
-OPTION( EXIV2_ENABLE_LIBXMP "Build a static convenience Library for XMP" OFF )
+OPTION( EXIV2_EXIV2_ENABLE_LIBXMP "Build a static convenience Library for XMP" OFF )
OPTION( EXIV2_ENABLE_PNG "Build with png support (requires libz)" ON )
OPTION( EXIV2_ENABLE_NLS "Build native language support (requires gettext)" ON )
OPTION( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON )
OPTION( EXIV2_ENABLE_LENSDATA "Build including lens data" ON )
OPTION( EXIV2_ENABLE_COMMERCIAL "Build with the EXV_COMMERCIAL_VERSION symbol set" OFF )
OPTION( EXIV2_ENABLE_BUILD_SAMPLES "Build the unit tests" OFF )
+OPTION( EXIV2_ENABLE_PO_RULES "Includes rules to build i18n files" OFF )
IF( MINGW OR UNIX )
ADD_DEFINITIONS(-Wall
@@ -105,6 +106,10 @@ ENDIF( ${EXV_HAVE_STDINT_H} )
ADD_SUBDIRECTORY( xmpsdk )
ADD_SUBDIRECTORY( src )
+IF( EXIV2_ENABLE_PO_RULES )
+ ADD_SUBDIRECTORY( po )
+ENDIF( EXIV2_ENABLE_PO_RULES )
+
IF( EXIV2_ENABLE_BUILD_SAMPLES )
ADD_SUBDIRECTORY( samples )
ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index 57b35d7..2f6b260 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -259,15 +259,16 @@ MACRO( OptionOutput _outputstring )
MESSAGE( STATUS "${_outputstring}${_var}" )
ENDMACRO( OptionOutput _outputstring )
-MESSAGE( STATUS "-------------------------------------------------------------" )
-MESSAGE( STATUS "${PACKAGE_STRING} configure results <${PACKAGE_URL}>" )
-OptionOutput( "Building PNG support: " EXIV2_ENABLE_PNG AND ZLIB_FOUND )
-OptionOutput( "Building shared library: " EXIV2_ENABLE_SHARED )
-OptionOutput( "XMP metadata support: " EXIV2_ENABLE_XMP )
-OptionOutput( "Building static libxmp: " ENABLE_LIBXMP )
-OptionOutput( "Native language support: " EXIV2_ENABLE_NLS )
-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 )
-MESSAGE( STATUS "-------------------------------------------------------------" )
+MESSAGE( STATUS "-----------------------------------------------------------------" )
+MESSAGE( STATUS "${PACKAGE_STRING} configure results <${PACKAGE_URL}>" )
+OptionOutput( "Building PNG support: " EXIV2_ENABLE_PNG AND ZLIB_FOUND )
+OptionOutput( "Building shared library: " EXIV2_ENABLE_SHARED )
+OptionOutput( "XMP metadata support: " EXIV2_ENABLE_XMP )
+OptionOutput( "Building static libxmp: " EXIV2_ENABLE_LIBXMP )
+OptionOutput( "Native language support: " EXIV2_ENABLE_NLS )
+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( "Includes rules to build i18n files " EXIV2_ENABLE_PO_RULES )
+MESSAGE( STATUS "-----------------------------------------------------------------" )
diff --git a/xmpsdk/CMakeLists.txt b/po/CMakeLists.txt
similarity index 84%
copy from xmpsdk/CMakeLists.txt
copy to po/CMakeLists.txt
index 691608a..9433647 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,5 +1,6 @@
# CMake build system for exiv2 library and executables
# Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -27,10 +28,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-if( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
- add_library( xmp STATIC ${XMPSRC} )
- get_target_property( XMPLIB xmp LOCATION )
- set( XMPLIB ${XMPLIB} PARENT_SCOPE )
-
- install(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} )
-endif( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP )
+
+# automatically include all po files in the directory
+FILE(GLOB PO_FILES *.po)
+
+ADD_TRANSLATIONS(hugin ${PO_FILES})
diff --git a/po/README-CMAKE b/po/README-CMAKE
new file mode 100644
index 0000000..e69de29
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1ae4f85..fb39b5a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -173,9 +173,9 @@ IF( MSVC )
ENDIF( MSVC )
IF( EXIV2_ENABLE_XMP )
- IF( NOT EXIV2_ENABLE_LIBXMP )
+ IF( NOT EXIV2_EXIV2_ENABLE_LIBXMP )
SET( LIBEXIV2_SRC ${XMPSRC} ${LIBEXIV2_SRC} )
- ENDIF( NOT EXIV2_ENABLE_LIBXMP )
+ ENDIF( NOT EXIV2_EXIV2_ENABLE_LIBXMP )
ENDIF( EXIV2_ENABLE_XMP )
# ******************************************************************************
@@ -189,9 +189,9 @@ SET_TARGET_PROPERTIES( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
-if( EXIV2_ENABLE_LIBXMP )
+if( EXIV2_EXIV2_ENABLE_LIBXMP )
TARGET_LINK_LIBRARIES( exiv2 ${XMPLIB} )
-ENDIF( EXIV2_ENABLE_LIBXMP )
+ENDIF( EXIV2_EXIV2_ENABLE_LIBXMP )
IF( EXIV2_ENABLE_PNG )
IF( ZLIB_FOUND )
@@ -203,9 +203,9 @@ IF( EXIV2_ENABLE_NLS )
TARGET_LINK_LIBRARIES( exiv2 ${LIBINTL_LIBRARIES} )
ENDIF( EXIV2_ENABLE_NLS )
-IF( ICONV_TEST )
+IF( ICONV_FOUND )
TARGET_LINK_LIBRARIES( exiv2 ${ICONV_LIBRARIES} )
-ENDIF( ICONV_TEST )
+ENDIF( ICONV_FOUND )
INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list