Git commit ceef5d70c9e21be1fba4c32f7b1c214836eb465d by Gilles Caulier.
Committed on 30/11/2016 at 21:49.
Pushed by cgilles into branch 'master'.

polish

M  +5    -6    project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
D  +0    -30   project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.pat=
ch

https://commits.kde.org/digikam-software-compilation/ceef5d70c9e21be1fba4c3=
2f7b1c214836eb465d

diff --git a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt b/project/bu=
ndles/3rdparty/ext_exiv2/CMakeLists.txt
index 558c0b0..8230f97 100755
--- a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
@@ -52,15 +52,14 @@ elseif(APPLE)
 =

         SVN_REPOSITORY svn://dev.exiv2.org/svn/trunk
 =

-        PATCH_COMMAND ${PATCH_COMMAND} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/=
exiv2-trunk.patch &&
-                      ${PATCH_COMMAND} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/=
exiv2-config-macports.patch
-
+        PATCH_COMMAND ${PATCH_COMMAND} -p0 -i ${CMAKE_CURRENT_SOURCE_DIR}/=
exiv2-trunk.patch
 =

-        CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exi=
v2} relwithdebinfo x86_64
+        CONFIGURE_COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bo=
otstrap.macports <SOURCE_DIR>/. &&
+                          <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exi=
v2} relwithdebinfo x86_64 "-DEXIV2_ENABLE_SHARED=3DON -DEXIV2_ENABLE_XMP=3D=
ON -DEXIV2_ENABLE_LIBXMP=3DON -DEXIV2_ENABLE_PNG=3DON -DEXIV2_ENABLE_NLS=3D=
OFF -DEXIV2_ENABLE_PRINTUCS2=3DON -DEXIV2_ENABLE_LENSDATA=3DON -DEXIV2_ENAB=
LE_COMMERCIAL=3DOFF -DEXIV2_ENABLE_BUILD_SAMPLES=3DOFF -DEXIV2_ENABLE_BUILD=
_PO=3DOFF -DEXIV2_ENABLE_VIDEO=3DOFF -DEXIV2_ENABLE_WEBREADY=3DOFF -DEXIV2_=
ENABLE_CURL=3DOFF -DEXIV2_ENABLE_SSH=3DOFF"
 =

-        BUILD_COMMAND cd <SOURCE_DIR>/build.cmake && make -j
+        BUILD_COMMAND cd <SOURCE_DIR>/build && make -j
 =

-        INSTALL_COMMAND cd <SOURCE_DIR>/build.cmake && make install/fast
+        INSTALL_COMMAND cd <SOURCE_DIR>/build && make install/fast
 =

         BUILD_IN_SOURCE 1
 =

diff --git a/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch=
 b/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch
deleted file mode 100644
index 9a66953..0000000
--- a/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: bootstrap.macports
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
---- bootstrap.macports	(revision 4686)
-+++ bootstrap.macports	(working copy)
-@@ -63,17 +63,17 @@
-       -DEXIV2_ENABLE_SHARED=3DON \
-       -DEXIV2_ENABLE_XMP=3DON \
-       -DEXIV2_ENABLE_LIBXMP=3DON \
--      -DEXIV2_ENABLE_VIDEO=3DON \
-       -DEXIV2_ENABLE_PNG=3DON \
--      -DEXIV2_ENABLE_NLS=3DON \
-+      -DEXIV2_ENABLE_NLS=3DOFF \
-       -DEXIV2_ENABLE_PRINTUCS2=3DON \
-       -DEXIV2_ENABLE_LENSDATA=3DON \
-       -DEXIV2_ENABLE_COMMERCIAL=3DOFF \
--      -DEXIV2_ENABLE_BUILD_SAMPLES=3DON \
--      -DEXIV2_ENABLE_BUILD_PO=3DON \
--      -DEXIV2_ENABLE_VIDEO=3DON \
--      -DEXIV2_ENABLE_WEBREADY=3DON \
--      -DEXIV2_ENABLE_CURL=3DON \
--      -DEXIV2_ENABLE_SSH=3DON \
-+      -DEXIV2_ENABLE_BUILD_SAMPLES=3DOFF \
-+      -DEXIV2_ENABLE_BUILD_PO=3DOFF \
-+      -DEXIV2_ENABLE_VIDEO=3DOFF \
-+      -DEXIV2_ENABLE_WEBREADY=3DOFF \
-+      -DEXIV2_ENABLE_CURL=3DOFF \
-+      -DEXIV2_ENABLE_SSH=3DOFF \
-+      -DEXV_WANT_VISIBILITY_SUPPORT=3DON \
-       -Wno-dev \
-       ..