[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:22 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=1e16d65
The following commit has been merged in the master branch:
commit 1e16d65d792169d2c496ebbd6451d1ec08799cd1
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Tue Apr 20 09:01:42 2010 +0000
use uppercase syntax.
polish coding style.
---
src/CMakeLists.txt | 343 +++++++++++++++++++++++++++--------------------------
1 file changed, 177 insertions(+), 166 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 047532d..f26c580 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,201 +27,212 @@
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+
# Private headers which are only needed for the library itself
-set( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
- crwimage_int.hpp
- makernote_int.hpp
- minoltasonyvalues.hpp
- orfimage_int.hpp
- pngchunk_int.hpp
- rw2image_int.hpp
- tiffcomposite_int.hpp
- tifffwd_int.hpp
- tiffimage_int.hpp
- tiffvisitor_int.hpp
-)
+SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
+ crwimage_int.hpp
+ makernote_int.hpp
+ minoltasonyvalues.hpp
+ orfimage_int.hpp
+ pngchunk_int.hpp
+ rw2image_int.hpp
+ tiffcomposite_int.hpp
+ tifffwd_int.hpp
+ tiffimage_int.hpp
+ tiffvisitor_int.hpp
+ )
+
# Add standalone C++ header files to this list
-set( LIBEXIV2_HDR basicio.hpp
- bmpimage.hpp
- canonmn.hpp
- convert.hpp
- cr2image.hpp
- crwimage.hpp
- datasets.hpp
- easyaccess.hpp
- error.hpp
- exif.hpp
- fujimn.hpp
- futils.hpp
- gifimage.hpp
- image.hpp
- iptc.hpp
- jp2image.hpp
- jpgimage.hpp
- metadatum.hpp
- minoltamn.hpp
- mn.hpp
- mrwimage.hpp
- nikonmn.hpp
- olympusmn.hpp
- orfimage.hpp
- panasonicmn.hpp
- pentaxmn.hpp
- pgfimage.hpp
- pngimage.hpp
- preview.hpp
- properties.hpp
- psdimage.hpp
- rafimage.hpp
- rcsid.hpp
- rw2image.hpp
- sigmamn.hpp
- sonymn.hpp
- tags.hpp
- tgaimage.hpp
- tiffimage.hpp
- types.hpp
- value.hpp
- version.hpp
- xmp.hpp
- xmpsidecar.hpp )
+SET( LIBEXIV2_HDR basicio.hpp
+ bmpimage.hpp
+ canonmn.hpp
+ convert.hpp
+ cr2image.hpp
+ crwimage.hpp
+ datasets.hpp
+ easyaccess.hpp
+ error.hpp
+ exif.hpp
+ fujimn.hpp
+ futils.hpp
+ gifimage.hpp
+ image.hpp
+ iptc.hpp
+ jp2image.hpp
+ jpgimage.hpp
+ metadatum.hpp
+ minoltamn.hpp
+ mn.hpp
+ mrwimage.hpp
+ nikonmn.hpp
+ olympusmn.hpp
+ orfimage.hpp
+ panasonicmn.hpp
+ pentaxmn.hpp
+ pgfimage.hpp
+ pngimage.hpp
+ preview.hpp
+ properties.hpp
+ psdimage.hpp
+ rafimage.hpp
+ rcsid.hpp
+ rw2image.hpp
+ sigmamn.hpp
+ sonymn.hpp
+ tags.hpp
+ tgaimage.hpp
+ tiffimage.hpp
+ types.hpp
+ value.hpp
+ version.hpp
+ xmp.hpp
+ xmpsidecar.hpp
+ )
# Add library C++ source files to this list
-set( LIBEXIV2_SRC basicio.cpp
- bmpimage.cpp
- canonmn.cpp
- convert.cpp
- cr2image.cpp
- crwedit.cpp
- crwimage.cpp
- datasets.cpp
- easyaccess.cpp
- error.cpp
- exif.cpp
- futils.cpp
- fujimn.cpp
- gifimage.cpp
- image.cpp
- iptc.cpp
- jp2image.cpp
- jpgimage.cpp
- makernote.cpp
- metadatum.cpp
- minoltamn.cpp
- minoltasonyvalues.cpp
- mrwimage.cpp
- nikonmn.cpp
- olympusmn.cpp
- orfimage.cpp
- panasonicmn.cpp
- pentaxmn.cpp
- pgfimage.cpp
- preview.cpp
- properties.cpp
- psdimage.cpp
- rafimage.cpp
- rw2image.cpp
- sigmamn.cpp
- sonymn.cpp
- tags.cpp
- tgaimage.cpp
- tiffcomposite.cpp
- tiffimage.cpp
- tiffvisitor.cpp
- types.cpp
- value.cpp
- version.cpp
- xmp.cpp
- xmpsidecar.cpp )
+SET( LIBEXIV2_SRC basicio.cpp
+ bmpimage.cpp
+ canonmn.cpp
+ convert.cpp
+ cr2image.cpp
+ crwedit.cpp
+ crwimage.cpp
+ datasets.cpp
+ easyaccess.cpp
+ error.cpp
+ exif.cpp
+ futils.cpp
+ fujimn.cpp
+ gifimage.cpp
+ image.cpp
+ iptc.cpp
+ jp2image.cpp
+ jpgimage.cpp
+ makernote.cpp
+ metadatum.cpp
+ minoltamn.cpp
+ minoltasonyvalues.cpp
+ mrwimage.cpp
+ nikonmn.cpp
+ olympusmn.cpp
+ orfimage.cpp
+ panasonicmn.cpp
+ pentaxmn.cpp
+ pgfimage.cpp
+ preview.cpp
+ properties.cpp
+ psdimage.cpp
+ rafimage.cpp
+ rw2image.cpp
+ sigmamn.cpp
+ sonymn.cpp
+ tags.cpp
+ tgaimage.cpp
+ tiffcomposite.cpp
+ tiffimage.cpp
+ tiffvisitor.cpp
+ types.cpp
+ value.cpp
+ version.cpp
+ xmp.cpp
+ xmpsidecar.cpp
+ )
# Add source files of simple applications to this list
-set( TAGLIST_SRC taglist.cpp )
+SET( TAGLIST_SRC taglist.cpp )
# Source files for the Exiv2 application
-set( EXIV2_SRC exiv2.cpp
- actions.cpp
- utils.cpp )
+SET( EXIV2_SRC exiv2.cpp
+ actions.cpp
+ utils.cpp
+ )
# Source files for the metacopy sample application
-set( MC_SRC metacopy.cpp
- utils.cpp )
-
-if( EXIV2_ENABLE_PNG )
- if( ZLIB_FOUND )
- set( LIBEXIV2_SRC ${LIBEXIV2_SRC} pngchunk.cpp
- pngimage.cpp )
- endif( ZLIB_FOUND )
-endif( EXIV2_ENABLE_PNG )
-
-if(NOT HAVE_TIMEGM )
- set( LIBEXIV2_SRC ${LIBEXIV2_SRC} localtime.c )
- set( EXIV2_SRC ${EXIV2_SRC} localtime.c )
-endif( NOT HAVE_TIMEGM )
-
-if( MSVC )
- set( MC_SRC ${MC_SRC} getopt_win32.c )
- set( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c )
- set( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c )
-endif( MSVC )
-
-
-if( EXIV2_ENABLE_XMP )
- if( NOT EXIV2_ENABLE_LIBXMP )
- set( LIBEXIV2_SRC ${XMPSRC} ${LIBEXIV2_SRC} )
- endif( NOT EXIV2_ENABLE_LIBXMP )
-endif( EXIV2_ENABLE_XMP )
+SET( MC_SRC metacopy.cpp
+ utils.cpp
+ )
+
+IF( EXIV2_ENABLE_PNG )
+ IF( ZLIB_FOUND )
+ SET( LIBEXIV2_SRC ${LIBEXIV2_SRC}
+ pngchunk.cpp
+ pngimage.cpp
+ )
+ ENDIF( ZLIB_FOUND )
+ENDIF( EXIV2_ENABLE_PNG )
+
+IF(NOT HAVE_TIMEGM )
+ SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} localtime.c )
+ SET( EXIV2_SRC ${EXIV2_SRC} localtime.c )
+ENDIF( NOT HAVE_TIMEGM )
+
+IF( MSVC )
+ SET( MC_SRC ${MC_SRC} getopt_win32.c )
+ SET( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c )
+ SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c )
+ENDIF( MSVC )
+
+IF( EXIV2_ENABLE_XMP )
+ IF( NOT EXIV2_ENABLE_LIBXMP )
+ SET( LIBEXIV2_SRC ${XMPSRC} ${LIBEXIV2_SRC} )
+ ENDIF( NOT EXIV2_ENABLE_LIBXMP )
+ENDIF( EXIV2_ENABLE_XMP )
# ******************************************************************************
# Library
-add_library( exiv2 ${STATIC_FLAG} ${LIBEXIV2_SRC} )
-set_target_properties( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+ADD_LIBRARY( exiv2 ${STATIC_FLAG} ${LIBEXIV2_SRC} )
+
+SET_TARGET_PROPERTIES( exiv2 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
- DEFINE_SYMBOL EXV_BUILDING_LIB )
+ DEFINE_SYMBOL EXV_BUILDING_LIB
+ )
+
+TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
if( EXIV2_ENABLE_LIBXMP )
- target_link_libraries( exiv2 ${XMPLIB} )
-endif( EXIV2_ENABLE_LIBXMP )
-target_link_libraries( exiv2 ${EXPAT_LIBRARIES} )
-if( EXIV2_ENABLE_PNG )
- if( ZLIB_FOUND )
- target_link_libraries( exiv2 ${ZLIB_LIBRARIES} )
- endif( ZLIB_FOUND )
-endif( EXIV2_ENABLE_PNG )
-if( EXIV2_ENABLE_NLS )
- target_link_libraries( exiv2 ${LIBINTL_LIBRARIES} )
-endif( EXIV2_ENABLE_NLS )
-if( ICONV_TEST )
- target_link_libraries( exiv2 ${ICONV_LIBRARIES} )
- message ( "----------------> ICONV_LIBRARIES : " ${ICONV_LIBRARIES} )
-endif( ICONV_TEST )
-
-install( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
+ TARGET_LINK_LIBRARIES( exiv2 ${XMPLIB} )
+ENDIF( EXIV2_ENABLE_LIBXMP )
+
+IF( EXIV2_ENABLE_PNG )
+ IF( ZLIB_FOUND )
+ TARGET_LINK_LIBRARIES( exiv2 ${ZLIB_LIBRARIES} )
+ ENDIF( ZLIB_FOUND )
+ENDIF( EXIV2_ENABLE_PNG )
+
+IF( EXIV2_ENABLE_NLS )
+ TARGET_LINK_LIBRARIES( exiv2 ${LIBINTL_LIBRARIES} )
+ENDIF( EXIV2_ENABLE_NLS )
+
+IF( ICONV_TEST )
+ TARGET_LINK_LIBRARIES( exiv2 ${ICONV_LIBRARIES} )
+ENDIF( ICONV_TEST )
+
+INSTALL_TARGET_STANDARD_ARGS( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
# ******************************************************************************
# Binary
-add_executable( exiv2bin ${EXIV2_SRC} )
-set_target_properties( exiv2bin PROPERTIES OUTPUT_NAME exiv2 )
-target_link_libraries( exiv2bin exiv2 )
-install( TARGETS exiv2bin ${INSTALL_TARGET_STANDARD_ARGS} )
+ADD_EXECUTABLE( exiv2bin ${EXIV2_SRC} )
+SET_TARGET_PROPERTIES( exiv2bin PROPERTIES OUTPUT_NAME exiv2 )
+TARGET_LINK_LIBRARIES( exiv2bin exiv2 )
+INSTALL_TARGET_STANDARD_ARGS( TARGETS exiv2bin ${INSTALL_TARGET_STANDARD_ARGS} )
# ******************************************************************************
# Binary
-add_executable( metacopy ${MC_SRC} )
-target_link_libraries( metacopy exiv2 )
-install( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
+ADD_EXECUTABLE( metacopy ${MC_SRC} )
+TARGET_LINK_LIBRARIES( metacopy exiv2 )
+INSTALL_TARGET_STANDARD_ARGS( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
# ******************************************************************************
# Binary
-add_executable( taglist ${TAGLIST_SRC} )
-target_link_libraries( taglist exiv2 )
-install( TARGETS taglist ${INSTALL_TARGET_STANDARD_ARGS} )
+ADD_EXECUTABLE( taglist ${TAGLIST_SRC} )
+TARGET_LINK_LIBRARIES( taglist exiv2 )
+INSTALL_TARGET_STANDARD_ARGS( TARGETS taglist ${INSTALL_TARGET_STANDARD_ARGS} )
# ******************************************************************************
# Headers
-install( FILES ${LIBEXIV2_HDR} DESTINATION include/exiv2 )
+INSTALL_TARGET_STANDARD_ARGS( FILES ${LIBEXIV2_HDR} DESTINATION include/exiv2 )
# ******************************************************************************
# Man page
-install( FILES exiv2.1 DESTINATION man/man1 )
+INSTALL_TARGET_STANDARD_ARGS( FILES exiv2.1 DESTINATION man/man1 )
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list