[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:49 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b8fd35d
The following commit has been merged in the master branch:
commit b8fd35dda76efa2d1bf50c697babb36c56ff8c43
Author: nkbj <nkbj1970 at hotmail.com>
Date: Sun Jan 25 05:17:39 2015 +0000
Check for CMake policies before they are used to ensure compatibility with CMake 2.8.12. Set CMake 2.8.12 as minimum requirement.
---
CMakeLists.txt | 8 ++++++--
xmpsdk/CMakeLists.txt | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb9b7ec..1b6e0a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,14 @@ if( EXISTS "${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h" )
endif()
##
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
PROJECT( exiv2 )
-cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH support
+if( POLICY CMP0042 )
+ cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH support
+else()
+ SET( CMAKE_MACOSX_RPATH 1 )
+endif()
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index df0e62c..c70dcfe 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -9,7 +9,9 @@
include(../CMake_msvc.txt)
msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
-cmake_policy(SET CMP0026 OLD) # Something to do with location
+if( POLICY CMP0026 )
+ cmake_policy(SET CMP0026 OLD) # Something to do with location
+endif()
FOREACH(_currentfile ${XMPSRC})
# http://www.openguru.com/2009/04/cmake-detecting-platformoperating.html
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list