[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=0e0dc94

The following commit has been merged in the master branch:
commit 0e0dc9488b210167c9ad9dc14f3a6b9483f2981d
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Dec 14 21:58:34 2015 +0000

    #1109 and #1041.  Use /usr/local/bin/cmake to build (because I can guarantee it on the buildserver).  Documentation Update.
---
 contrib/buildserver/dailyReadMe.txt |  5 -----
 jenkins_daily.sh                    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/contrib/buildserver/dailyReadMe.txt b/contrib/buildserver/dailyReadMe.txt
index cda1da9..1f7dc03 100644
--- a/contrib/buildserver/dailyReadMe.txt
+++ b/contrib/buildserver/dailyReadMe.txt
@@ -50,11 +50,6 @@ $ export DYLD_LIBRARY_PATH="$PWD/macosx/lib:$DYLD_LIBRARY_PATH"
 $ macosx/bin/exiv2
 
 To compile and link your own code:
-  Caution:
-  You may need to install pkg-config with Mac Ports
-  To install Mac Ports: https://www.macports.org
-  To install pkg-config: $ sudo port install pkgconfig
-
 $ cd dist
 $ sudo cp -R macosx/* /usr/local
 $ g++ samples/exifprint.cpp -lexiv2 -o exifprint
diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index f39755e..d546cb2 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -42,15 +42,14 @@ if [ "$PLATFORM" == "msvc" ]; then
     build=$(cygpath -aw ./build)
      dist=$(cygpath -au ./build/dist/$vs/$arch/$mode/$config/bin)
      msvc=$(cygpath -au ./contrib/cmake/msvc)
-     exe=.exe
-     bin=''
+      exe=.exe
+      bin=''
 else
-    PATH="/usr/local/bin:/bin:$PATH"
     exiv2=$PWD
     build=$PWD/build
-    dist=$PWD/build/dist/$PLATFORM
-    exe=''
-    bin=bin
+     dist=$PWD/build/dist/$PLATFORM
+      exe=''
+      bin=bin
     if [ -e $exiv2/CMakeCache.txt ]; then rm -rf $exiv2/CMakeCache.txt ; fi
 fi
 
@@ -79,12 +78,16 @@ echo "---- build = $build ------"
   else
     pushd $build > /dev/null
     (
+      # build 64 bit library
       export CFLAGS=-m64
       export CXXFLAGS=-m64
       export LDFLAGS=-m64
-      cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
+      # Always use /usr/local/bin/cmake 
+      # I can guarantee it to be at least 3.4.1
+      # because I built it from source and installed it
+      /usr/local/bin/cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
       make
-      cmake --build . --target install
+      /usr/local/bin/cmake --build . --target install
     )
     popd > /dev/null
   fi

-- 
exiv2 packaging