diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-11-15 13:26:21 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-11-15 13:51:03 +0100 |
| commit | 90df209f276b17a66112cbb58c040693be14d217 (patch) | |
| tree | 742747120c2c5b2b873279a43854ed1623d84684 | |
| parent | 41347c60637fe6e7cae307e07ad0430eb79652d1 (diff) | |
| download | PROJ-90df209f276b17a66112cbb58c040693be14d217.tar.gz PROJ-90df209f276b17a66112cbb58c040693be14d217.zip | |
autoconf / cmake: build test/ only if needed
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | travis/mingw32/install.sh | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 62a16d7f..66a0d4cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,5 +191,6 @@ add_subdirectory(include) add_subdirectory(src) add_subdirectory(man) add_subdirectory(cmake) -add_subdirectory(test) - +if(PROJ_TESTS) + add_subdirectory(test) +endif() diff --git a/Makefile.am b/Makefile.am index 52e456ff..8620ea8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = include src man data jniwrap cmake test +SUBDIRS = include src man data jniwrap cmake +DIST_SUBDIRS = include src man data jniwrap cmake test EXTRA_DIST = CMakeLists.txt CITATION @@ -8,6 +9,9 @@ pkgconfig_DATA = proj.pc AUTOMAKE_OPTIONS = dist-zip ACLOCAL_AMFLAGS = -I m4 +check-local: + cd test; $(MAKE) check + README: README.md fgrep -v "[![" $< > $@ diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index 6d388156..defe1485 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -26,7 +26,7 @@ make -j3 make install make dist-all find /tmp/proj_autoconf_install -#make check +(cd test; make -j3) test/unit/test_cpp_api.exe cd .. # Now with grids |