[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:36 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3c1819a
The following commit has been merged in the master branch:
commit 3c1819a37fed8735f7e2ffacf47165355a6cfc8c
Author: Robin Mills <robin at clanmills.com>
Date: Wed Aug 10 04:52:42 2016 +0000
Fix CMake/MacOS-X Subversion_SVN_EXECUTABLE
---
CMakeLists.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 747c4ac..6f2c836 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,6 +137,14 @@ IF( ${EXV_HAVE_STDINT_H} )
ADD_DEFINITIONS( -DEXV_HAVE_STDINT_H )
ENDIF( ${EXV_HAVE_STDINT_H} )
+##
+# MacOS-X default svn is /usr/bin/svn which is protected with System Integrity Protection
+# Apple reset it to version 1.7.22 when the OS is upgraded
+# http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/
+IF(EXISTS "/usr/local/bin/svn")
+ SET(Subversion_SVN_EXECUTABLE /usr/local/bin/svn)
+ENDIF()
+
SET(SVN_REVISION "0")
IF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
FIND_PACKAGE(Subversion QUIET)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list