2015.08.31 18:14 "Re: [Tiff] [patch] cmake fixes", by Roger Leigh

On 31/08/2015 16:34, Bob Friesenhahn wrote:

On Mon, 31 Aug 2015, rleigh@codelibre.net wrote:

See attached patches.

I will look at these changes in perhaps 12 hours.

Is there any way to integrate CMake into the Automake 'distcheck' target? This would be very helpful to assure that we don't release tarballs with missing files, and that everything is still working.

Other projects support both Autotools and CMake so perhaps some other project has already figured this out?

Patch attached to make it run cmake as part of 'distcheck'. Note that this makes it require cmake 3.0.0 or later for this target to work, and it also requires the patch 03 from my previous email for the tests to pass.

Regards,
Roger

Index: Makefile.am

=================================================================== RCS file: /cvs/maptools/cvsroot/libtiff/Makefile.am,v retrieving revision 1.23

diff -u -r1.23 Makefile.am
--- Makefile.am 30 Aug 2015 21:26:45 -0000 1.23
+++ Makefile.am 31 Aug 2015 18:05:43 -0000
@@ -49,6 +49,16 @@

 dist_doc_DATA = $(docfiles)

+distcheck-hook:

+       mkdir $(distdir)/_build/cmake \
+       && cd $(distdir)/_build/cmake \
+       && cmake ../.. \
+       && $(MAKE) \
+       && ctest -V \
+       && $(MAKE) DESTDIR=../_inst/cmake install \
+       && $(RM) -r $(distdir)/_build/cmake \
+       && $(RM) -r $(distdir)/_inst/cmake
+
 SUBDIRS = port libtiff tools build contrib test man html

 release: