Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope

# Conflicts:
#	.gitignore
#	build-config/meson.build
#	meson.build
#	meson_options.txt
#	src/composition/public/composition.h
#	src/config/public/config.h
#	src/constants/public/const.h
#	src/meson.build
#	tests/composition_sandbox/comp.cpp

assets/static/atomic/include/atomicSpecies.h

@@ -1,5 +1,4 @@
-#ifndef SPECIES_MASS_DATA_H
-#define SPECIES_MASS_DATA_H
+#pragma once
 #include <unordered_map>
 #include <string_view>
 #include <string>
@@ -7205,4 +7204,3 @@ namespace chemSpecies {
         {"Og-295", Og_295},
     };
 }; // namespace chemSpecies
-#endif // SPECIES_MASS_DATA_H

build-config/pybind/meson.build

@@ -0,0 +1,5 @@
+if get_option('build_python')
+    pybind11_proj = subproject('pybind11')
+    pybind11_dep = pybind11_proj.get_variable('pybind11_dep')
+    python3_dep = dependency('python3')
+endif

build-config/quill/meson.build

@@ -1,5 +1,10 @@
+quill_cmake_options = cmake.subproject_options()
+quill_cmake_options.add_cmake_defines({
+                                     'BUILD_SHARED_LIBS': 'ON',
+                                     'CMAKE_SKIP_INSTALL_RULES': 'ON'
+})
 quill_sp = cmake.subproject(
-    'quill'
+    'quill',
+    options: quill_cmake_options,
 )
 quill_dep = quill_sp.dependency('quill')
-add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/quill/__CMake_build', language: 'cpp')

src/network/meson.build

@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 # Define the libnetwork library so it can be linked against by other parts of the build system
-libnetwork = static_library('network',
+libnetwork = library('network',
     network_sources, 
     include_directories: include_directories('public'),
     dependencies: dependencies,

subprojects/pybind11.wrap

@@ -0,0 +1,13 @@
+[wrap-file]
+directory = pybind11-2.13.5
+source_url = https://github.com/pybind/pybind11/archive/refs/tags/v2.13.5.tar.gz
+source_filename = pybind11-2.13.5.tar.gz
+source_hash = b1e209c42b3a9ed74da3e0b25a4f4cd478d89d5efbb48f04b277df427faf6252
+patch_filename = pybind11_2.13.5-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pybind11_2.13.5-1/get_patch
+patch_hash = ecb031b830481560b3d8487ed63ba4f5509a074be42f5d19af64d844c795e15b
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/pybind11_2.13.5-1/pybind11-2.13.5.tar.gz
+wrapdb_version = 2.13.5-1
+
+[provide]
+pybind11 = pybind11_dep