[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:08 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2d5dc28
The following commit has been merged in the master branch:
commit 2d5dc284e21ba7a7b217c7ccaeb29d50e2402e9e
Author: Robin Mills <robin at clanmills.com>
Date: Tue Oct 4 11:57:36 2016 +0000
#1230 CMake Maintenance. Adding EXIV2_HDR to exiv2/headers and LIBEXIV2_PRIVATE_HDR to libexiv2/headers.
---
src/CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9918329..7403975 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,5 @@
# CMake build system for exiv2 library and executables
# Copyright 2015- Daniel Kaneider <danielkaneider at users.sf.net>
-# Copyright 2012- Robin Mills <robin at clanmills.com>
# Copyright 2010-2012 Gilles Caulier <caulier dot gilles at gmail dot com>
# Copyright 2008 Patrick Spendrin <ps_ml at gmx.de>
@@ -202,6 +201,11 @@ SET( EXIV2_SRC exiv2.cpp
actions.cpp
utils.cpp
)
+SET( EXIV2_HDR exiv2app.hpp
+ actions.hpp
+ utils.hpp
+)
+
# connection test application
SET( CONNTEST ../samples/conntest.cpp)
@@ -233,7 +237,7 @@ ENDIF( MSVC )
# ******************************************************************************
# exiv2lib library
-ADD_LIBRARY( exiv2lib ${STATIC_FLAG} ${LIBEXIV2_SRC} ${LIBEXIV2_HDR} )
+ADD_LIBRARY( exiv2lib ${STATIC_FLAG} ${LIBEXIV2_SRC} ${LIBEXIV2_HDR} ${LIBEXIV2_PRIVATE_HDR} )
SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
@@ -308,7 +312,7 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
# ******************************************************************************
# exiv2 application
-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} )
+ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} )
TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list