TREX/qmckl
1
0
Fork 0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2024-12-22 12:23:56 +01:00
Code Issues Projects Releases Wiki Activity

Fixed distcheck with updated trexio

Browse Source
This commit is contained in:
Anthony Scemama 2021-10-14 10:50:51 +02:00
parent 6afb78429a
commit 4e36bba278
4 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile.am
View File

@ -54,12 +54,13 @@ src_qmckl_f = src/qmckl_f.f90
src_qmckl_fo = src/qmckl_f.o
header_tests = tests/chbrclf.h tests/n2.h
fortrandir = $(datadir)/$(PACKAGE_NAME)/fortran/
testdatadir = $(datadir)/$(PACKAGE_NAME)/test_data/
fortrandir = $(datadir)/qmckl/fortran/
dist_fortran_DATA = $(qmckl_f)
AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/include
AM_CPPFLAGS += -DQMCKL_TEST_DIR="\"$(abs_srcdir)/share/qmckl/test_data/\""
AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/include
lib_LTLIBRARIES = src/libqmckl.la
src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(header_tests)
@ -68,7 +69,7 @@ export qmckl_f qmckl_h srcdir
CLEANFILES+=$(test_qmckl_f) $(src_qmckl_f) $(test_qmckl_o) $(src_qmckl_o)
htmlize_el=share/doc/qmckl/html/htmlize.el
htmlize_el=$(srcdir)/share/doc/qmckl/html/htmlize.el
include generated.mk
@ -114,17 +115,17 @@ BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC
CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES) $(C_TEST_FILES) $(F_TEST_FILES) $(qmckl_f) $(qmckl_h) $(HTML_FILES) $(TEXT_FILES) share/doc/qmckl/html/index.html $(EXPORTED_FILES) $(header_tests)
EXTRA_DIST += \
tools/build_doc.sh \
tools/build_makefile.py \
tools/build_qmckl_f.sh \
tools/build_qmckl_h.sh \
tools/config_doc.el \
tools/config_tangle.el \
tools/init.el \
tools/install_htmlize.sh \
tools/lib.org \
tools/tangle.sh \
tools/theme.setup
$(srcdir)/tools/build_doc.sh \
$(srcdir)/tools/build_makefile.py \
$(srcdir)/tools/build_qmckl_f.sh \
$(srcdir)/tools/build_qmckl_h.sh \
$(srcdir)/tools/config_doc.el \
$(srcdir)/tools/config_tangle.el \
$(srcdir)/tools/init.el \
$(srcdir)/tools/install_htmlize.sh \
$(srcdir)/tools/lib.org \
$(srcdir)/tools/tangle.sh \
$(srcdir)/tools/theme.setup
## Silent

6
configure.ac
View File

@ -49,9 +49,9 @@ AC_CONFIG_MACRO_DIR([m4])
VERSION_MAJOR=`echo ${PACKAGE_VERSION} | cut -d. -f1`
VERSION_MINOR=`echo ${PACKAGE_VERSION} | cut -d. -f2`
VERSION_PATCH=`echo ${PACKAGE_VERSION} | cut -d. -f3 | cut -d- -f1`
AC_DEFINE_UNQUOTED(QMCKL_VERSION_MAJOR, [$VERSION_MAJOR], [major version])
AC_DEFINE_UNQUOTED(QMCKL_VERSION_MINOR, [$VERSION_MINOR], [minor version])
AC_DEFINE_UNQUOTED(QMCKL_VERSION_PATCH, [$VERSION_PATCH], [patch version])
AC_DEFINE_UNQUOTED([QMCKL_VERSION_MAJOR], [$VERSION_MAJOR], [major version])
AC_DEFINE_UNQUOTED([QMCKL_VERSION_MINOR], [$VERSION_MINOR], [minor version])
AC_DEFINE_UNQUOTED([QMCKL_VERSION_PATCH], [$VERSION_PATCH], [patch version])
AC_SUBST([VERSION_MAJOR])
AC_SUBST([VERSION_MINOR])
AC_SUBST([VERSION_PATCH])

11
org/qmckl_trexio.org
View File

@ -885,14 +885,13 @@ qmckl_exit_code rc;
char fname[256];
char message[256];
if (getenv("QMCKL_TESTDIR") == NULL) {
fprintf(stderr, "QMCKL_TESTDIR not set\n");
exit(2);
}
#ifndef QMCKL_TEST_DIR
#error "QMCKL_TEST_DIR is not defined"
#endif
strncpy(fname, getenv("QMCKL_TESTDIR"),255);
strncpy(fname, QMCKL_TEST_DIR,255);
strncat(fname, "/chbrclf", 255);
printf("Test file: %s\n", fname);
rc = qmckl_trexio_read(context, fname);
if (rc != QMCKL_SUCCESS) {

2
tools/build_makefile.py
View File

@ -238,7 +238,7 @@ def main():
prefix + "_LDFLAGS = -no-install",
"" ]
tmp = "dist_testdata_DATA = "
tmp = "EXTRA_DIST += "
for dir in glob("share/qmckl/test_data/*"):
for f in glob("%s/*"%(dir)):
tmp += " \\\n "+f