From 394622df4752dad7453a7286e3ccaffa60e8bdc6 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Wed, 30 Apr 2025 11:41:10 -0400 Subject: [PATCH] feat(python-composition): added composition module interface --- assets/static/atomic/include/atomicSpecies.h | 4 +--- build-config/pybind/meson.build | 5 +++++ build-config/quill/meson.build | 11 ++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/assets/static/atomic/include/atomicSpecies.h b/assets/static/atomic/include/atomicSpecies.h index 64c6596a..be265b39 100644 --- a/assets/static/atomic/include/atomicSpecies.h +++ b/assets/static/atomic/include/atomicSpecies.h @@ -1,5 +1,4 @@ -#ifndef SPECIES_MASS_DATA_H -#define SPECIES_MASS_DATA_H +#pragma once #include #include #include @@ -7205,4 +7204,3 @@ namespace chemSpecies { {"Og-295", Og_295}, }; }; // namespace chemSpecies -#endif // SPECIES_MASS_DATA_H diff --git a/build-config/pybind/meson.build b/build-config/pybind/meson.build index e69de29b..94888e18 100644 --- a/build-config/pybind/meson.build +++ b/build-config/pybind/meson.build @@ -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 \ No newline at end of file diff --git a/build-config/quill/meson.build b/build-config/quill/meson.build index 3c5a89d8..a069255e 100644 --- a/build-config/quill/meson.build +++ b/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') \ No newline at end of file +quill_dep = quill_sp.dependency('quill') \ No newline at end of file