diff options
| author | bfriesen <bfriesen> | 2015-09-01 02:51:50 +0000 |
|---|---|---|
| committer | bfriesen <bfriesen> | 2015-09-01 02:51:50 +0000 |
| commit | 678df49cb6d54f8ec0d36559698f48d6a15332e9 (patch) | |
| tree | 1c75f18906afddb456c643172856480b1ca0f129 /test | |
| parent | a09d7f2a0e34eb614e056e27c7c3f5eb8ec17edb (diff) | |
| download | libtiff-678df49cb6d54f8ec0d36559698f48d6a15332e9.tar.gz | |
* CMakeLists.txt, libtiff/test/Makefile.am: Applied patches by
Roger Leigh (via tiff mailing list on 2015-08-31.
CMake reads all version information directly from configure.ac to
avoid duplication of values. This basically greps over the file
for the LIBTIFF_* variables, then translates them to the form
needed for cmake. This includes the release version and libtool
shared library version information.
Make shared/static library building configurable. Currently it
always builds shared libraries, with static libs having a _static
suffix (copying zlib, but it means it's got a non-standard name).
CMake has a -DBUILD_SHARED_LIBS=ON|OFF option to select one or the
other, which is now used instead. There's now a single "tiff"
target to build either shared or static as required, and all the
tests and tools are linked with this. Note: the Windows tests fail
when linked with a static libtiff (says: libtiff.dll not found).
Not really a regression since this was not tested up to this
point, and it's likely the unit tests haven't (ever?) been run on
Windows with a static libtiff, so there's some additional
portability issue here to address. Works fine on UNIX systems,
and fine on Windows with the default to build a DLL.
Add a missing file which wasn't being distributed, causing unit
tests to fail. Note that "find . -name '*.cmake'" lists all the
CMake files which need distributing in addition to all the
CMakeLists.txt files (which now are distributed).
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 3 | ||||
| -rw-r--r-- | test/Makefile.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index bc506096..0aca56fc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -39,7 +39,8 @@ EXTRA_DIST = \ CMakeLists.txt \ common.sh \ TiffSplitTest.cmake \ - TiffTestCommon.cmake + TiffTestCommon.cmake \ + TiffTest.cmake # All of the tests to execute via 'make check' TESTS = $(check_PROGRAMS) $(TESTSCRIPTS) diff --git a/test/Makefile.in b/test/Makefile.in index 2c8dbff6..0b2cf1d6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -643,7 +643,8 @@ EXTRA_DIST = \ CMakeLists.txt \ common.sh \ TiffSplitTest.cmake \ - TiffTestCommon.cmake + TiffTestCommon.cmake \ + TiffTest.cmake # Extra files which should be cleaned by 'make clean' |