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
This commit is contained in:
@@ -9,13 +9,12 @@ composition_headers = files(
|
||||
|
||||
dependencies = [
|
||||
probe_dep,
|
||||
config_dep,
|
||||
quill_dep,
|
||||
species_weight_dep
|
||||
]
|
||||
|
||||
# Define the libcomposition library so it can be linked against by other parts of the build system
|
||||
libcomposition = static_library('composition',
|
||||
libcomposition = library('composition',
|
||||
composition_sources,
|
||||
include_directories: include_directories('public'),
|
||||
cpp_args: ['-fvisibility=default'],
|
||||
|
||||
Reference in New Issue
Block a user