diff --git a/meson.build b/meson.build index 922b2b8..93fc895 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,6 @@ if get_option('pkg_config') description: 'Composition module for SERiF and related projects', version: meson.project_version(), libraries: [libcomposition], - subdirs: ['fourdst'], filebase: 'fourdst_composition', install_dir: join_paths(get_option('libdir'), 'pkgconfig') ) diff --git a/src/composition/meson.build b/src/composition/meson.build index 4741ef4..ca7836a 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -90,6 +90,12 @@ composition_exception_headers = files( ) install_headers(composition_exception_headers, subdir : 'fourdst/composition/exceptions') +composition_iterator_headers = files( + 'include/fourdst/composition/iterators/composition_abstract_iterator.h', +) + +install_headers(composition_iterator_headers, subdir : 'fourdst/composition/iterators') + v = meson.project_version() conf_data = configuration_data() diff --git a/subprojects/libconfig.wrap b/subprojects/libconfig.wrap index ba46330..90fd85d 100644 --- a/subprojects/libconfig.wrap +++ b/subprojects/libconfig.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconfig.git -revision = v2.0.2 +revision = v2.2.6 depth = 1 [provide] diff --git a/subprojects/libconstants.wrap b/subprojects/libconstants.wrap index bdf9f60..a0acb4e 100644 --- a/subprojects/libconstants.wrap +++ b/subprojects/libconstants.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconstants.git -revision = v1.1.1 +revision = v1.1.2 depth = 1 [provide] diff --git a/subprojects/liblogging.wrap b/subprojects/liblogging.wrap index 48bea5a..33a7d1f 100644 --- a/subprojects/liblogging.wrap +++ b/subprojects/liblogging.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/liblogging.git -revision = v1.1.1 +revision = v1.1.2 depth = 1 [provide] diff --git a/tests/composition/compositionTest.cpp b/tests/composition/compositionTest.cpp index 693f58d..5226a88 100644 --- a/tests/composition/compositionTest.cpp +++ b/tests/composition/compositionTest.cpp @@ -511,8 +511,8 @@ TEST_F(compositionTest, standardSolarCompositions) { std::string string_comp = io::SolarCompositions_to_string_map.at(comp); std::string string_iso = io::IsotopicPercentages_to_string_map.at(iso); - EXPECT_NO_THROW(get_composition_record(comp, iso, 0.02, 0.28)); - EXPECT_NO_THROW(get_composition_record(string_comp, string_iso, 0.02, 0.28)); + EXPECT_NO_THROW((void)get_composition_record(comp, iso, 0.02, 0.28)); + EXPECT_NO_THROW((void)get_composition_record(string_comp, string_iso, 0.02, 0.28)); } }