[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=73452b6

The following commit has been merged in the master branch:
commit 73452b67b7d4e0cdc0c7fe888efa27a3acb23321
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Jun 18 08:57:25 2015 +0000

    polish
---
 bootstrap.macports | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/bootstrap.macports b/bootstrap.macports
index bace4b8..0dd2879 100755
--- a/bootstrap.macports
+++ b/bootstrap.macports
@@ -55,6 +55,11 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
       -DCMAKE_OSX_ARCHITECTURES=${TARGET_TYPE} \
       -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}" \
+      -DCMAKE_COLOR_MAKEFILE=ON \
+      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+      -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
+      -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
+      -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/modules" \
       -DEXIV2_ENABLE_SHARED=ON \
       -DEXIV2_ENABLE_XMP=ON \
       -DEXIV2_ENABLE_LIBXMP=ON \
@@ -71,13 +76,4 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DEXIV2_ENABLE_CURL=ON \
       -DEXIV2_ENABLE_SSH=ON \
       -Wno-dev \
-      -DCMAKE_COLOR_MAKEFILE=ON \
-      -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-      -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
-      -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
-      -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/modules" \
-      -DBUNDLE_INSTALL_DIR=${BUNDLE_INSTALL_DIR} \
-      -DQT_QT_INCLUDE_DIR=${INSTALL_PREFIX}/include \
-      -DQT_LIBRARY_DIR=${INSTALL_PREFIX}/lib \
-      -DQT_QMAKE_EXECUTABLE=${INSTALL_PREFIX}/bin/qmake \
       ..

-- 
exiv2 packaging