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

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')
+quill_dep = quill_sp.dependency('quill')

src/probe/meson.build

@@ -35,7 +35,7 @@ dependencies = [
 ]
 
 # Define the liblogger library so it can be linked against by other parts of the build system
-libprobe = static_library('probe',
+libprobe = library('probe',
     probe_sources, 
     include_directories: include_directories('public'),
     cpp_args: ['-fvisibility=default'],