Merge pull request #947 from DLR-AMR/update-submodules

DLR-AMR · Feb 23, 2024 · fa6ae93 · fa6ae93
2 parents 7150952 + 7350be0
commit fa6ae93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/p4est b/p4est
diff --git a/sc b/sc
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -156,9 +156,13 @@ 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 = -version-info 2:0:0
-src_libt8_la_LIBADD = @T8_P4EST_LDADD@ @T8_SC_LDADD@
+src_libt8_la_LIBADD = @T8_P4EST_LIBADD@ @T8_SC_LIBADD@
+EXTRA_src_libt8_la_DEPENDENCIES = @T8_SC_EDEPS@
+
+AM_LDFLAGS =
+AM_LDFLAGS += @T8_SC_RPATH@
 LDADD += src/libt8.la @T8_P4EST_LDADD@ @T8_SC_LDADD@
-EXTRA_src_libt8_la_DEPENDENCIES = @T8_P4EST_LDADD@ @T8_SC_LDADD@
+
 
 nodist_include_HEADERS += $(libt8_generated_headers)
 dist_include_HEADERS = $(libt8_installed_headers)
+83 −22		.github/workflows/ci_cmake.yml
+23 −26		CMakeLists.txt
+20 −1		CMakePresets.json
+2 −19		Makefile.am
+15 −15		README
+0 −86		cmake/FindSC.cmake
+4 −11		cmake/compilers.cmake
+63 −30		cmake/config.cmake
+4 −0		cmake/config.cmake.in
+1 −1		cmake/git.cmake
+11 −6		cmake/init_build_type.cmake
+0 −14		cmake/install.cmake
+44 −30		cmake/jansson.cmake
+18 −12		cmake/options.cmake
+2 −2		cmake/pkgconf.cmake
+4 −2		cmake/sc_config.h.in
+8 −0		cmake/valgrind.cmake
+25 −37		cmake/zlib.cmake
+1 −1		config/sc_autotools.pc.in
+1 −1		config/sc_include.m4
+1 −0		config/sc_mpi.m4
+31 −4		config/sc_package.m4
+7 −0		config/sc_soversion.in
+1 −2		configure.ac
+0 −1		doc/Doxyfile.in
+0 −0		doc/attic/puff.h
+1 −0		doc/author_dreyer.txt
+1 −0		doc/author_wang.txt
+1 −0		doc/author_williams.txt
+72 −0		doc/libsc-build-wdeps.sh
+31 −0		doc/mainpage.dox
+48 −0		doc/release_notes.txt
+11 −26		example/CMakeLists.txt
+0 −2		example/function/Makefile.am
+0 −2		example/logging/Makefile.am
+0 −2		example/openmp/Makefile.am
+0 −2		example/options/Makefile.am
+0 −3		example/pthread/Makefile.am
+0 −2		example/testing/Makefile.am
+0 −2		example/v4l2/Makefile.am
+1 −4		iniparser/Makefile.am
+1 −5		libb64/Makefile.am
+1 −6		src/CMakeLists.txt
+15 −15		src/Makefile.am
+19 −10		src/sc.c
+10 −1		src/sc.h
+3 −0		src/sc3_mpi_types.h
+1 −16		src/sc_builtin/gettimeofday.c
+0 −0		src/sc_builtin/sc_getopt.h
+77 −14		src/sc_containers.c
+99 −42		src/sc_containers.h
+471 −188		src/sc_io.c
+205 −73		src/sc_io.h
+2 −0		src/sc_keyvalue.h
+74 −8		src/sc_mpi.c
+55 −6		src/sc_mpi.h
+8 −6		src/sc_notify.c
+5 −4		src/sc_options.c
+24 −0		src/sc_scda.c
+1,114 −0		src/sc_scda.h
+1 −1		src/sc_shmem.h
+20 −9		test/CMakeLists.txt
+7 −15		test/Makefile.am
+1 −1		test/test_builtin.c
+10 −0		test/test_helpers.c
+171 −0		test/test_io_file.c
+225 −0		test/test_mpi_pack.c
+69 −0		test/test_scda.c