From 53fc943129776b27dfee42ce0aa7894e6b9f5801 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Wed, 19 Feb 2025 14:50:44 -0500 Subject: [PATCH] build(yaml-cpp): added yaml-cpp as a dependency config files will be written in yaml, added a well tested yaml parser to 4DSSE --- .gitignore | 1 + build-config/meson.build | 5 ++++- build-config/mfem/meson.build | 1 - build-config/yaml-cpp/meson.build | 5 +++++ subprojects/yaml-cpp.wrap | 5 +++++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 build-config/yaml-cpp/meson.build create mode 100644 subprojects/yaml-cpp.wrap diff --git a/.gitignore b/.gitignore index 3d33190..9e57e7f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,5 +60,6 @@ tags subprojects/mfem/ subprojects/tetgen/ +subprojects/yaml-cpp/ .vscode/ diff --git a/build-config/meson.build b/build-config/meson.build index cefc100..894cf67 100644 --- a/build-config/meson.build +++ b/build-config/meson.build @@ -1 +1,4 @@ -subdir('mfem') \ No newline at end of file +cmake = import('cmake') + +subdir('mfem') +subdir('yaml-cpp') \ No newline at end of file diff --git a/build-config/mfem/meson.build b/build-config/mfem/meson.build index 84f69c8..7152d04 100644 --- a/build-config/mfem/meson.build +++ b/build-config/mfem/meson.build @@ -1,4 +1,3 @@ -cmake = import('cmake') patchFile = files('disable_mfem_selfcheck.patch') patch_check = run_command('grep', '-q', 'MFEM_CHECK_TARGET_NAME', 'subprojects/mfem/CMakeLists.txt', check: false) diff --git a/build-config/yaml-cpp/meson.build b/build-config/yaml-cpp/meson.build new file mode 100644 index 0000000..434a233 --- /dev/null +++ b/build-config/yaml-cpp/meson.build @@ -0,0 +1,5 @@ +yaml_cpp_sp = cmake.subproject( + 'yaml-cpp' +) +yaml_cpp_dep = yaml_cpp_sp.dependency('yaml-cpp') +add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/yaml-cpp/__CMake_build', language: 'cpp') \ No newline at end of file diff --git a/subprojects/yaml-cpp.wrap b/subprojects/yaml-cpp.wrap new file mode 100644 index 0000000..df0133d --- /dev/null +++ b/subprojects/yaml-cpp.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/jbeder/yaml-cpp.git +revision = yaml-cpp-0.7.0 + +[cmake] \ No newline at end of file