2015.09.01 17:56 "Re: [Tiff] [patch] cmake fixes", by Roger Leigh

On 01/09/2015 18:36, Roger Leigh wrote:

On 01/09/2015 16:42, Bob Friesenhahn wrote:

I do see that the Jenkins build is proceeding with the other patches and that it is close to done now.

The attached patches should help here:

This latest set of patches is now applied. I verified 'make distcheck' on three different machines. Two use cmake 2.8.9 and one uses 2.8.12.2.

Thanks. It's looking good. Just one minor issue with BSD make, fixed by the attached patch.

Use of 'cmake' in 'make distcheck' will need to be optional before the next release since it may be used by other than the person producing the official libtiff release. Configure could check for cmake and the use in 'distcheck' could then be conditional.

I'll look at this next.

This is now also attached.

Index: configure.ac

=================================================================== RCS file: /cvs/maptools/cvsroot/libtiff/configure.ac,v retrieving revision 1.111

diff -u -r1.111 configure.ac

--- configure.ac        1 Sep 2015 15:38:03 -0000       1.111
+++ configure.ac        1 Sep 2015 17:54:34 -0000

@@ -109,8 +109,11 @@
 dnl We want warnings. As many warnings as possible.
 VL_PROG_CC_WARNINGS()

+dnl Checks for programs
 AC_PROG_INSTALL
 AC_PROG_LN_S

+# Used only for validating the source distribution during distcheck +AC_PATH_PROG(CMAKE, cmake)

 # Check if LD supports linker scripts, and define automake conditional

Index: Makefile.am
===================================================================
RCS file: /cvs/maptools/cvsroot/libtiff/Makefile.am,v

retrieving revision 1.24
diff -u -r1.24 Makefile.am
--- Makefile.am 1 Sep 2015 15:38:01 -0000 1.24
+++ Makefile.am 1 Sep 2015 17:54:34 -0000
@@ -50,12 +50,14 @@
 dist_doc_DATA = $(docfiles)

 distcheck-hook:

• mkdir $(distdir)/_build/cmake \
• && cd $(distdir)/_build/cmake \
• && cmake ../.. \
• && $(MAKE) \
• && ctest -V \
• && $(MAKE) DESTDIR=../../_inst/cmake install

+       if [ -x "$(CMAKE)" ]; then \
+         mkdir $(distdir)/_build/cmake \
+         && cd $(distdir)/_build/cmake \
+         && cmake ../.. \
+         && $(MAKE) \
+         && ctest -V \
+         && $(MAKE) DESTDIR=../../_inst/cmake install ; \
+       fi
        $(RM) -r $(distdir)/_build/cmake
        $(RM) -r $(distdir)/_inst/cmake