Skip to content

Commit

Permalink
Merge pull request #876 from DLR-AMR/fix-compilation-from-release-tar…
Browse files Browse the repository at this point in the history
…ball
  • Loading branch information
holke authored Dec 5, 2023
2 parents 67e65db + 22df8f4 commit f300821
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ libt8_internal_headers = \
src/t8_forest/t8_forest_cxx.h \
src/t8_forest/t8_forest_ghost.h \
src/t8_forest/t8_forest_balance.h src/t8_forest/t8_forest_types.h \
src/t8_forest/t8_forest_private.h
src/t8_forest/t8_forest_private.h \
src/t8_mat.h \
src/t8_windows.h
libt8_compiled_sources = \
src/t8.c src/t8_eclass.c src/t8_mesh.c \
src/t8_element.c src/t8_element_cxx.cxx \
Expand Down Expand Up @@ -153,7 +155,7 @@ src_libt8_la_SOURCES = \
src_libt8_la_CPPFLAGS = $(AM_CPPFLAGS) $(T8_CPPFLAGS)
## This is the official API versioning scheme of libtool. Please see:
## Read https://www.gnu.org/software/libtool/manual/libtool.html#Versioning
src_libt8_la_LDFLAGS = -release $(VERSION) -version-info 2:0:0
src_libt8_la_LDFLAGS = -version-info 2:0:0
src_libt8_la_LIBADD = @T8_P4EST_LDADD@ @T8_SC_LDADD@
LDADD += src/libt8.la @T8_P4EST_LDADD@ @T8_SC_LDADD@
EXTRA_src_libt8_la_DEPENDENCIES = @T8_P4EST_LDADD@ @T8_SC_LDADD@
Expand Down
12 changes: 11 additions & 1 deletion test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
#Non-recursive Makefile.am in test
#Included from toplevel directory

t8code_googletest_installed_headers = test/t8_gtest_custom_assertion.hxx
t8code_googletestincludedir=

t8code_googletest_installed_headers = \
test/t8_gtest_custom_assertion.hxx

t8code_googletest_internal_headers = \
thirdparty/googletest-mpi/gtest/gtest.h \
test/t8_gtest_macros.hxx \
test/t8_schemes/t8_gtest_dfs_base.hxx

t8code_googletest_programs = \
test/t8_gtest_cmesh_bcast \
Expand Down Expand Up @@ -522,6 +530,8 @@ test_libgtest_la_CPPFLAGS += $(t8_gtest_target_mpi_cpp_flags)
endif
test_libgtest_la_LDFLAGS = -pthread

dist_t8code_googletestinclude_HEADERS = $(t8code_googletest_installed_headers)
dist_t8code_googletestinclude_HEADERS += $(t8code_googletest_internal_headers)

TESTS += $(t8code_googletest_programs)
check_PROGRAMS += $(t8code_googletest_programs)

0 comments on commit f300821

Please sign in to comment.