diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 20:09:51 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 20:09:51 (GMT) |
| commit | 7e929a9bec66863f1f31721282d1fa459bc486ff (patch) | |
| tree | 1e222e9876e2e7a50ce221d98401be9511302340 /fortran | |
| parent | 436250369ae18c957c48c30dd328e68b4594dfce (diff) | |
| parent | 6e1dc507240fba447c79827897b099e91b9dd5c1 (diff) | |
| download | hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.zip hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.tar.gz hdf5-7e929a9bec66863f1f31721282d1fa459bc486ff.tar.bz2 | |
Merge pull request #1728 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:bugfix/HDFFV-9976-add-configuration-or-make-options to develop
* commit '6e1dc507240fba447c79827897b099e91b9dd5c1':
Add release note for enable-tools and enable-tests options.
Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow disabling tests. Moved h5cc.in from tools/src/misc to src directory to always create h5cc whether or not tools are enabled. Added configuration status of tools and tests to libhdf5.settings.
Add options to enable or disable building tools and tests. The default is enabled for each.
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fortran/Makefile.am b/fortran/Makefile.am index ca0733f..c07fa3e 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -22,14 +22,21 @@ include $(top_srcdir)/config/commence.am -if BUILD_PARALLEL_CONDITIONAL +if BUILD_TESTS_PARALLEL_CONDITIONAL TESTPARALLEL_DIR=testpar +else + TESTPARALLEL_DIR= +endif +if BUILD_TESTS_CONDITIONAL + TESTSERIAL_DIR=test +else + TESTSERIAL_DIR= endif # Subdirectories in build order, not including examples directory ## Only recurse into subdirectories if HDF5 is configured to use Fortran. if BUILD_FORTRAN_CONDITIONAL - SUBDIRS=src test $(TESTPARALLEL_DIR) + SUBDIRS=src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) # Test with just the native connector, with a single pass-through connector # and with a doubly-stacked pass-through. |