From e762ba3de9e64afa8ab83f23601901a9f2a3eee5 Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Tue, 1 Sep 2015 15:38:01 +0000 Subject: [PATCH] * CMakeLists.txt, Makefile.am, configure.ac: Applied patches by Roger Leigh (via tiff mailing list on 2015-09-01). CMake build is now included in 'distcheck' target. Builds with CMake 2.8.9 and newer. Tar is now resquested to use POSIX PAX format. --- CMakeLists.txt | 14 +++++--- ChangeLog | 11 +++++++ Makefile.am | 10 ++++++ Makefile.in | 11 +++++++ configure | 87 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 2 +- 6 files changed, 129 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22284cc1..1ee6fd46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,10 @@ # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE # OF THIS SOFTWARE. -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 2.8.9) -# Default policy is from 3.0.0 -cmake_policy(VERSION 3.0.0) +# Default policy is from 2.8.9 +cmake_policy(VERSION 2.8.9) # Set MacOSX @rpath usage globally. if (POLICY CMP0020) cmake_policy(SET CMP0020 NEW) @@ -68,7 +68,13 @@ message(STATUS "libtiff library version ${SO_MAJOR}.${SO_MINOR}.${SO_REVISION}") set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries") # Project version -project(tiff VERSION "${LIBTIFF_MAJOR_VERSION}.${LIBTIFF_MINOR_VERSION}.${LIBTIFF_MICRO_VERSION}" LANGUAGES C) +project(tiff C) +set(VERSION "${LIBTIFF_MAJOR_VERSION}.${LIBTIFF_MINOR_VERSION}.${LIBTIFF_MICRO_VERSION}") +set(tiff_VERSION "${VERSION}") +set(tiff_VERSION_MAJOR "${LIBTIFF_MAJOR_VERSION}") +set(tiff_VERSION_MINOR "${LIBTIFF_MINOR_VERSION}") +set(tiff_VERSION_PATCH "${LIBTIFF_MICRO_VERSION}") + # the other tiff_VERSION_* variables are set automatically set(tiff_VERSION_ALPHA "${LIBTIFF_ALPHA_VERSION}") # Library version (unlike libtool's baroque scheme, WYSIWYG here) diff --git a/ChangeLog b/ChangeLog index f41492ee..7a8620be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-09-01 Bob Friesenhahn + + * CMakeLists.txt, Makefile.am, configure.ac: Applied patches by + Roger Leigh (via tiff mailing list on 2015-09-01). + + CMake build is now included in 'distcheck' target. + + Builds with CMake 2.8.9 and newer. + + Tar is now resquested to use POSIX PAX format. + 2015-08-31 Bob Friesenhahn * CMakeLists.txt, libtiff/test/Makefile.am: Applied patches by diff --git a/Makefile.am b/Makefile.am index 8f310beb..012794b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,16 @@ EXTRA_DIST = \ 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: diff --git a/Makefile.in b/Makefile.in index 6ab730bb..12f0e620 100644 --- a/Makefile.in +++ b/Makefile.in @@ -762,6 +762,7 @@ distcheck: dist test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build/sub \ && ../../configure \ @@ -951,6 +952,16 @@ uninstall-am: uninstall-dist_docDATA uninstall-pkgconfigDATA .PRECIOUS: Makefile +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 + release: (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) diff --git a/configure b/configure index 09b6000d..5ef8eaaf 100755 --- a/configure +++ b/configure @@ -3423,7 +3423,92 @@ AMTAR='$${TAR-tar}' # We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar pax cpio none' -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 +$as_echo_n "checking how to create a pax tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_pax-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=posix -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x pax -w "$$tardir"' + am__tar_='pax -L -x pax -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H pax -L' + am__tar_='find "$tardir" -print | cpio -o -H pax -L' + am__untar='cpio -i -H pax -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_pax}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + if ${am_cv_prog_tar_pax+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_pax=$_am_tool +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 +$as_echo "$am_cv_prog_tar_pax" >&6; } diff --git a/configure.ac b/configure.ac index d8da5d3d..f9785227 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ AC_LANG(C) dnl Compute the canonical host (run-time) system type variable AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(tar-pax) dnl Do not rebuild generated files every time AM_MAINTAINER_MODE