[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=383ca9e

The following commit has been merged in the master branch:
commit 383ca9ec1bc4214d0bb5b252f300c4fdd7bf7083
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Oct 3 09:19:23 2016 +0000

    #1230 and #1236 Buildserver maintenance.  Work-in-progress fixes for CMake/MinGW32
---
 CMakeLists.txt                    | 2 +-
 TODO-CMAKE                        | 5 ++---
 contrib/buildserver/dailyBuild.sh | 7 ++++---
 contrib/cmake/mingw/ReadMe.txt    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79cfc7c..d83a286 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,7 +195,7 @@ ENDIF( EXIV2_ENABLE_BUILD_PO )
 
 ##
 # tests
-ADD_CUSTOM_TARGET(tests COMMAND make tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
+ADD_CUSTOM_TARGET(tests COMMAND env EXIV2_BINDIR="${CMAKE_BINARY_DIR}"/bin make tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
 
 ##
 # http://dev.exiv2.org/boards/3/topics/1364
diff --git a/TODO-CMAKE b/TODO-CMAKE
index 28d0e45..b5395c4 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -44,8 +44,7 @@ Here are notes concerning CMake/MinGW
         set "INCLUDE_PATH=/usr/local/inc"
         set "LIBRARY_PATH=/usr/local/lib"
         set "BINARY_PATH=/usr/local/bin"
-        rem set "PATH=c:\MinGWin;c:\MinGW\msys
.0in;c:\MinGW\msys
.0\localin;c:\Users
mills
-- 
exiv2 packaging