[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:59 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d3aaf04
The following commit has been merged in the master branch:
commit d3aaf04062dd48254a37c4181d6fa758a7bd1ccf
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Tue Mar 27 11:00:44 2012 +0000
use dedicated licence file for CMake Script, as it done into KDE project.
---
CMakeLists.txt | 160 ++++++++++++++++++++----------------------------
COPYING-CMAKE-SCRIPTS | 22 +++++++
config/FindEXPAT.cmake | 3 +
config/FindMSGFMT.cmake | 3 +
4 files changed, 96 insertions(+), 92 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27130b8..318ed96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,33 +1,9 @@
# 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
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# 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.
+# Copyright 2008 by Patrick Spendrin <ps_ml at gmx dot de>
+# Copyright 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
PROJECT( exiv2 )
@@ -69,59 +45,59 @@ ENDIF( MINGW OR UNIX )
if( MSVC )
- # add_library("../zlib-1.2.5" SHARED IMPORTED)
-
- #include_directories( "../zlib-1.2.5" "../expat-2.0.1/lib" )
- #set(EXPAT_INCLUDE_DIR "../expat-2.0.1/lib" )
- #set(ZLIB_INCLUDE_DIR "../zlib-1.2.5" )
-
- #set(EXPAT_LIBRARY "../expat-2.0.1")
- #set(ZLIB_LIBRARY "../zlib-1.2.5" )
-
- # target_link_libraries("zlibd.lib")
- # add_subdirectory("../zlib-1.2.5" "../zlib-1.2.5" )
- # set_target_properties(exiv2 PROPERTIES LINK_FLAGS "/LIBPATH:../zlib-1.2.5/$(ConfigurationName)")
- # target_link_libraries(A B)
- # set_property(TARGET PROPERTY LINK_FLAGS "/LIBPATH:../zlib-1.2.5/$(ConfigurationName)")
-
- # cmake CMakeLists.txt -G "Visual Studio 9 2008" (Win64)
- # cm.bat 2008 64 "-DEXIV2_ENABLE_SHARED=OFF" (32/ON) for 4 builds
- # for %p in (Debug,Release) do devenv exiv2.sln /build %p for 2 builds
- set( P_DIR Win32 )
- set( T_DIR Static)
-
- # 64 bit
- if( CMAKE_SIZEOF_VOID_P MATCHES 8 )
- SET( P_DIR x64)
- endif( CMAKE_SIZEOF_VOID_P MATCHES 8 )
-
- # DLL/static build
- if( EXIV2_ENABLE_SHARED )
- set( T_DIR Dynamic )
- endif( EXIV2_ENABLE_SHARED )
-
- set(B_DIR ${PROJECT_BINARY_DIR}/bin/${P_DIR}/${T_DIR})
- set(CMAKE_CURRENT_BINARY_DIR ${B_DIR})
- set(EXECUTABLE_OUTPUT_PATH ${B_DIR})
- set(LIBRARY_OUTPUT_PATH ${B_DIR})
-
- #if ( EXIV2_ENABLE_XMP )
- # ..\expat\Win32\Debug\libexpat.lib
- # ..\xmpsdk\Win32\Debug\xmpsdk.lib
- # ..\zlib\Win32\Debug\zlib1d.lib
- #endif( EXIV2_ENABLE_XMP )
-
+ # add_library("../zlib-1.2.5" SHARED IMPORTED)
+
+ #include_directories( "../zlib-1.2.5" "../expat-2.0.1/lib" )
+ #set(EXPAT_INCLUDE_DIR "../expat-2.0.1/lib" )
+ #set(ZLIB_INCLUDE_DIR "../zlib-1.2.5" )
+
+ #set(EXPAT_LIBRARY "../expat-2.0.1")
+ #set(ZLIB_LIBRARY "../zlib-1.2.5" )
+
+ # target_link_libraries("zlibd.lib")
+ # add_subdirectory("../zlib-1.2.5" "../zlib-1.2.5" )
+ # set_target_properties(exiv2 PROPERTIES LINK_FLAGS "/LIBPATH:../zlib-1.2.5/$(ConfigurationName)")
+ # target_link_libraries(A B)
+ # set_property(TARGET PROPERTY LINK_FLAGS "/LIBPATH:../zlib-1.2.5/$(ConfigurationName)")
+
+ # cmake CMakeLists.txt -G "Visual Studio 9 2008" (Win64)
+ # cm.bat 2008 64 "-DEXIV2_ENABLE_SHARED=OFF" (32/ON) for 4 builds
+ # for %p in (Debug,Release) do devenv exiv2.sln /build %p for 2 builds
+ set( P_DIR Win32 )
+ set( T_DIR Static)
+
+ # 64 bit
+ if( CMAKE_SIZEOF_VOID_P MATCHES 8 )
+ SET( P_DIR x64)
+ endif( CMAKE_SIZEOF_VOID_P MATCHES 8 )
+
+ # DLL/static build
+ if( EXIV2_ENABLE_SHARED )
+ set( T_DIR Dynamic )
+ endif( EXIV2_ENABLE_SHARED )
+
+ set(B_DIR ${PROJECT_BINARY_DIR}/bin/${P_DIR}/${T_DIR})
+ set(CMAKE_CURRENT_BINARY_DIR ${B_DIR})
+ set(EXECUTABLE_OUTPUT_PATH ${B_DIR})
+ set(LIBRARY_OUTPUT_PATH ${B_DIR})
+
+ #if ( EXIV2_ENABLE_XMP )
+ # ..\expat\Win32\Debug\libexpat.lib
+ # ..\xmpsdk\Win32\Debug\xmpsdk.lib
+ # ..\zlib\Win32\Debug\zlib1d.lib
+ #endif( EXIV2_ENABLE_XMP )
+
endif( MSVC )
#IF( MINGW OR UNIX )
- IF( EXIV2_ENABLE_XMP )
- SET( HAVE_XMP_TOOLKIT ON )
- SET( XMPLIB "do" )
- ENDIF( EXIV2_ENABLE_XMP )
+ IF( EXIV2_ENABLE_XMP )
+ SET( HAVE_XMP_TOOLKIT ON )
+ SET( XMPLIB "do" )
+ ENDIF( EXIV2_ENABLE_XMP )
#ENDIF( MINGW OR UNIX )
#IF( MINGW OR UNIX )
- INCLUDE( config/ConfigureChecks.cmake )
+ INCLUDE( config/ConfigureChecks.cmake )
#ENDIF( MINGW OR UNIX )
SET( INSTALL_TARGET_STANDARD_ARGS
@@ -132,23 +108,23 @@ SET( INSTALL_TARGET_STANDARD_ARGS
# add sources from XMPSDK directory - this needs to be done here
#IF( MINGW OR UNIX )
- SET( XMPSRC ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ExpatAdapter.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/MD5.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ParseRDF.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/UnicodeConversions.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPIterator.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPMeta.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPUtils.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XML_Node.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPCore_Impl.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPIterator.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-GetSet.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-Parse.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-Serialize.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils-FileInfo.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils.cpp
- )
+ SET( XMPSRC ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ExpatAdapter.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/MD5.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ParseRDF.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/UnicodeConversions.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPIterator.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPMeta.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/WXMPUtils.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XML_Node.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPCore_Impl.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPIterator.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-GetSet.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-Parse.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta-Serialize.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPMeta.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils-FileInfo.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils.cpp
+ )
#ENDIF( MINGW OR UNIX )
# the following lines need to be added to circumvent the error in xmpsdk\src\MD5.h
diff --git a/COPYING-CMAKE-SCRIPTS b/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000..4b41776
--- /dev/null
+++ b/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER 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.
diff --git a/config/FindEXPAT.cmake b/config/FindEXPAT.cmake
index ee804e1..3532d8c 100644
--- a/config/FindEXPAT.cmake
+++ b/config/FindEXPAT.cmake
@@ -4,6 +4,9 @@
# EXPAT_INCLUDE_DIRS - where to find expat.h, etc.
# EXPAT_LIBRARIES - List of libraries when using expat.
# EXPAT_FOUND - True if expat found.
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# Look for the header file.
FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h)
diff --git a/config/FindMSGFMT.cmake b/config/FindMSGFMT.cmake
index 0c06bfe..9a73f2b 100644
--- a/config/FindMSGFMT.cmake
+++ b/config/FindMSGFMT.cmake
@@ -17,6 +17,9 @@
# look in C:\MinGW after std. Unix places, that's where
# gettext automatically installed itself on my system.
# TODO find where else on Windows, Mac, etc gettext might be
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
IF(MSGFMT_EXECUTABLE)
SET(MSGFMT_FOUND TRUE)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list