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:
@@ -54,6 +54,10 @@ if get_option('build_tests')
|
||||
subdir('tests')
|
||||
endif
|
||||
|
||||
if get_option('build_python')
|
||||
subdir('build-python')
|
||||
endif
|
||||
|
||||
if get_option('build_post_run_utils')
|
||||
subdir('utils')
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user