[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=e84fdce

The following commit has been merged in the master branch:
commit e84fdce68bc203dc57b6cb8ae0b8ae733fa94335
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Nov 29 22:58:51 2015 +0000

    #1041.  Documentation Update.
---
 README-CMAKE | 42 +++++++++++++++++++++---------------------
 TODO-CMAKE   | 16 ++++++----------
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/README-CMAKE b/README-CMAKE
index 0c7d142..5e0aef8 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -10,12 +10,9 @@ NOTE:
   We will flag them as "deprecated" for at least one release cycle (about 12 months).
   Our plan is to only support CMake when our scripts are feature-complete, stable and documented.
   
-  All help is appreciated.  If you know and understand CMake (especially with Visual Studio)
-  please consider contributing your time and skill to help Exiv2 and CMake work well together.
-  
 Robin Mills
 robin at clanmills.com
-2015-02-23
+2015-11-30
 
 -------------------------------------------------------------------------------
 
@@ -120,25 +117,28 @@ The current architecture of CMake requires you to decide before running cmake:
 2)  32bit or 64 bit builds
 3)  Building static or shared libraries
 
-Code FileSystem Layout
-----------------------
-The simplest starting point for VS and CMake is to use the batch files in exiv-src/contrib/build/msvc. 
-For those script you will need:
-- Cygwin (in order to download all dependencies (zlib, expat, ssl, curl, ssh), including exiv2 trunk from svn)
-- CMake
-- SVN (optional)
-
-Then
- - put the two scripts (build.cmd and setenv.cmd) into a completely empty directory
- - adapt the paths in setenv.cmd
- - open the VS command line shell
- - execute build.cmd (if there are any errors, the script should tell you)
+We have two contributed CMake Build Environments:
+
+1 contrib/cmake/msvc
+  Please read contrib/cmake/msvc/ReadMe.txt
+  
+2 contrib/build/msvc
+
+  For those script you will need:
+  - Cygwin (in order to download all dependencies (zlib, expat, ssl, curl, ssh), including exiv2 trunk from svn)
+  - CMake
+  - SVN (optional)
+
+  Then
+   - put the two scripts (build.cmd and setenv.cmd) into a completely empty directory
+   - adapt the paths in setenv.cmd
+   - open the VS command line shell
+   - execute build.cmd (if there are any errors, the script should tell you)
  
-Exiv2 should be then packaged in the dist directory with all the .lib, include and binary files you need.  
+  Exiv2 should be then packaged in the dist directory with all the .lib, include and binary files you need.  
  
-If you need to compile with different options (without webready for example), simply edit the build.cmd file 
-and adapt the options (somewhere at the end).
-
+  If you need to compile with different options (without webready for example), simply edit the build.cmd file 
+  and adapt the options (somewhere at the end).
 
 4 Building and Installing for other users (Xcode, Eclipse, Qt)
 ==============================================================
diff --git a/TODO-CMAKE b/TODO-CMAKE
index 46063d3..875a316 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -1,15 +1,11 @@
 Current Status
 
-ToDo: * Fix out of source builds for NMake
-      * Find and link iconv library on Windows
-      * Test Cygwin, MinGW, Xcode, NMake and more versions of MSVC
-      * Revisit searching for zlib, expat and iconv
-      * Work on the "inherited from Gilles" list below
+ToDo: * option cmakeBuild --webready is broken (Daniel to fix)
+      * look at the items listed below which we inherited from Gilles
 
-Bugs: * 2005/32/debug won't run. "SideBySide" error (manifest trouble)
-	  * 2003/32 does not compile (1000's of template errors)
-
-Done: * Support for out of source builds (this is still suspect)
+Done: * working well on Unix systems (Linux, Mac, Cygwin, MinGW)
+      * Visual Studio (2005/8/10/12/13/15).  See contrib/cmake/msvc/ReadMe.txt
+      * Support for out of source builds
       * Add header files to MSVC UI for exiv2lib (and changed exiv2bin->exiv2 and exiv2->exiv2lib)
       * Searching better for expat, zlib and iconv
 	  * write FindLibexiv2.cmake (Thank you, Gilles)
@@ -18,7 +14,7 @@ Done: * Support for out of source builds (this is still suspect)
 
 Robin Mills
 robin at clanmills.com
-2012-06-09
+2015-11-29
 
 Inherited from Gilles Caulier <caulier dot gilles at gmail dot com>:
 

-- 
exiv2 packaging