tboudreaux/SERiF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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:
Emily Boudreaux
2025-06-11 15:05:11 -04:00
parent 2586adba59 144e8e2e08
commit 72f08238b6
37 changed files with 839 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build-config/meson.build
View File

@@ -6,4 +6,18 @@ subdir('quill')
subdir('boost')
subdir('opatIO')
subdir('mpi')
subdir('hypre')
subdir('hypre')
subdir('pybind')
# Set the config file error handling options
configErr = get_option('config_error_handling')
# build up any -D flags we need
commonCppArgs = []
if configErr == 'warn'
commonCppArgs += ['-DCONFIG_WARN']
elif configErr == 'harsh'
commonCppArgs += ['-DCONFIG_HARSH']
endif
add_project_arguments(commonCppArgs, language: 'cpp')

3
build-config/mfem/meson.build
View File

@@ -4,10 +4,11 @@ mfem_cmake_options.add_cmake_defines({
'MFEM_ENABLE_TESTING': 'OFF',
'MFEM_ENABLE_MINIAPPS': 'OFF',
'MFEM_USE_BENCMARK': 'OFF',
'BUILD_SHARED_LIBS': 'ON',
'CMAKE_SKIP_INSTALL_RULES': 'ON'
})
mfem_sp = cmake.subproject(
'mfem',
options: mfem_cmake_options)
mfem_dep = mfem_sp.dependency('mfem')
add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/mfem/__CMake_build/config', language: 'cpp')

5
build-config/pybind/meson.build Normal file
View File

@@ -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

11
build-config/quill/meson.build
View File

@@ -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')

7
build-config/yaml-cpp/meson.build
View File

@@ -1,10 +1,11 @@
yaml_cpp_cmake_options = cmake.subproject_options()
yaml_cpp_cmake_options.add_cmake_defines({
'CMAKE_POLICY_VERSION_MINIMUM': '3.5'
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
'BUILD_SHARED_LIBS': 'ON',
'CMAKE_SKIP_INSTALL_RULES': 'ON'
})
yaml_cpp_sp = cmake.subproject(
'yaml-cpp',
options: yaml_cpp_cmake_options,
)
yaml_cpp_dep = yaml_cpp_sp.dependency('yaml-cpp')
add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/yaml-cpp/__CMake_build', language: 'cpp')
yaml_cpp_dep = yaml_cpp_sp.dependency('yaml-cpp')