TREX/trexio
1
0
Fork 0
mirror of https://github.com/TREX-CoE/trexio.git synced 2025-01-03 18:16:22 +01:00
Code Issues Projects Releases Wiki Activity

use HAVE_HDF5 instead of DO_HDF5 for conditional compilation

Browse Source
This commit is contained in:
q-posev 2021-11-02 10:32:51 +01:00
parent 7f3ee3cc18
commit cce0f49785
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -61,11 +61,9 @@ SOURCES = \
src/trexio_text.c \ src/trexio_text.c \
src/trexio_text.h src/trexio_text.h
if DO_HDF5 if HAVE_HDF5
SOURCES += src/trexio_hdf5.c \ SOURCES += src/trexio_hdf5.c \
src/trexio_hdf5.h src/trexio_hdf5.h
endif endif
ORG_FILES = \ ORG_FILES = \
@ -90,8 +88,7 @@ TESTS_C = \
tests/overwrite_all_text \ tests/overwrite_all_text \
tests/io_all tests/io_all
if DO_HDF5 if HAVE_HDF5
TESTS_C += \ TESTS_C += \
tests/open_hdf5 \ tests/open_hdf5 \
tests/io_num_hdf5 \ tests/io_num_hdf5 \
@ -101,7 +98,6 @@ TESTS_C += \
tests/io_str_hdf5 \ tests/io_str_hdf5 \
tests/io_dset_str_hdf5 \ tests/io_dset_str_hdf5 \
tests/overwrite_all_hdf5 tests/overwrite_all_hdf5
endif endif
TESTS_F = \ TESTS_F = \
@ -125,8 +121,7 @@ tests_io_dset_str_text_LDFLAGS = -no-install
tests_overwrite_all_text_LDFLAGS = -no-install tests_overwrite_all_text_LDFLAGS = -no-install
tests_io_all_LDFLAGS = -no-install tests_io_all_LDFLAGS = -no-install
if DO_HDF5 if HAVE_HDF5
tests_open_hdf5_LDFLAGS = -no-install tests_open_hdf5_LDFLAGS = -no-install
tests_io_num_hdf5_LDFLAGS = -no-install tests_io_num_hdf5_LDFLAGS = -no-install
tests_io_dset_float_hdf5_LDFLAGS = -no-install tests_io_dset_float_hdf5_LDFLAGS = -no-install
@ -135,7 +130,6 @@ tests_io_safe_dset_float_hdf5_LDFLAGS = -no-install
tests_io_str_hdf5_LDFLAGS = -no-install tests_io_str_hdf5_LDFLAGS = -no-install
tests_io_dset_str_hdf5_LDFLAGS = -no-install tests_io_dset_str_hdf5_LDFLAGS = -no-install
tests_overwrite_all_hdf5_LDFLAGS = -no-install tests_overwrite_all_hdf5_LDFLAGS = -no-install
endif endif

2
configure.ac
View File

@ -115,7 +115,7 @@ AC_SUBST([PKG_HDF5])
AC_SUBST([PKG_CFLAGS]) AC_SUBST([PKG_CFLAGS])
AC_SUBST([PKG_LIBS]) AC_SUBST([PKG_LIBS])
AM_CONDITIONAL([DO_HDF5],[test "$with_hdf5" = "yes"]) AM_CONDITIONAL([HAVE_HDF5],[test "$with_hdf5" = "yes"])
# The block below should only execute if the ax_lib_hdf5.m4 macro failed to find HDF5. # The block below should only execute if the ax_lib_hdf5.m4 macro failed to find HDF5.
# It is only needed to manually build Python API because setup.py depends on HDF5. # It is only needed to manually build Python API because setup.py depends on HDF5.