diff --git a/assets/static/atomic/README.md b/assets/static/atomic/README.md deleted file mode 100644 index dd5c2a3..0000000 --- a/assets/static/atomic/README.md +++ /dev/null @@ -1 +0,0 @@ -Use the utility `utils/atomic/convertWeightsToHeader.py` to generate atomicWeights.h diff --git a/assets/static/atomic/meson.build b/assets/static/atomic/meson.build deleted file mode 100644 index c003a92..0000000 --- a/assets/static/atomic/meson.build +++ /dev/null @@ -1,16 +0,0 @@ -required_headers = [ - 'atomicSpecies.h', - 'species.h' -] - -foreach h : required_headers - if not cpp.has_header(h, include_directories: include_directories('include')) - error('SERiF requires the header file ' + h + ' to be present in the assets/static/atomic/include directory.') - endif -endforeach - -species_weight_dep = declare_dependency( - include_directories: include_directories('include'), -) - -message('✅ SERiF species_weight dependency declared') \ No newline at end of file diff --git a/assets/static/meson.build b/assets/static/meson.build deleted file mode 100644 index aa735dc..0000000 --- a/assets/static/meson.build +++ /dev/null @@ -1 +0,0 @@ -subdir('atomic') diff --git a/meson.build b/meson.build index 903835c..ef09169 100644 --- a/meson.build +++ b/meson.build @@ -18,14 +18,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libcomposition', 'cpp', version: 'v1.0.5', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libcomposition', 'cpp', version: 'v1.0.6', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') cpp = meson.get_compiler('cpp') subdir('build-config') -subdir('assets/static') subdir('src') subdir('tests') diff --git a/assets/static/atomic/include/atomicSpecies.h b/src/composition/include/fourdst/composition/atomicSpecies.h similarity index 99% rename from assets/static/atomic/include/atomicSpecies.h rename to src/composition/include/fourdst/composition/atomicSpecies.h index b126805..2650df9 100644 --- a/assets/static/atomic/include/atomicSpecies.h +++ b/src/composition/include/fourdst/composition/atomicSpecies.h @@ -3,7 +3,6 @@ #include #include #include -#include "atomicSpecies.h" namespace fourdst::atomic { struct Species { diff --git a/src/composition/public/composition.h b/src/composition/include/fourdst/composition/composition.h similarity index 99% rename from src/composition/public/composition.h rename to src/composition/include/fourdst/composition/composition.h index d3671da..250f374 100644 --- a/src/composition/public/composition.h +++ b/src/composition/include/fourdst/composition/composition.h @@ -27,10 +27,9 @@ #include -#include "config.h" -#include "logging.h" - -#include "atomicSpecies.h" +#include "fourdst/config/config.h" +#include "fourdst/logging/logging.h" +#include "fourdst/composition/atomicSpecies.h" namespace fourdst::composition { struct CanonicalComposition { diff --git a/assets/static/atomic/include/species.h b/src/composition/include/fourdst/composition/species.h similarity index 99% rename from assets/static/atomic/include/species.h rename to src/composition/include/fourdst/composition/species.h index 66acdd8..508db80 100644 --- a/assets/static/atomic/include/species.h +++ b/src/composition/include/fourdst/composition/species.h @@ -2,7 +2,8 @@ #include #include #include -#include "atomicSpecies.h" + +#include "fourdst/composition/atomicSpecies.h" namespace fourdst::atomic { static const Species n_1("n-1", "n", 1, 1, 0, 1, 0.0, "B-", 782.347, 1.0086649159, 0.00047); diff --git a/src/composition/private/composition.cpp b/src/composition/lib/composition.cpp similarity index 99% rename from src/composition/private/composition.cpp rename to src/composition/lib/composition.cpp index 6c12184..d1ae121 100644 --- a/src/composition/private/composition.cpp +++ b/src/composition/lib/composition.cpp @@ -18,8 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // *********************************************************************** */ -#include "composition.h" -#include "const.h" #include "quill/LogMacros.h" #include @@ -30,8 +28,10 @@ #include -#include "atomicSpecies.h" -#include "species.h" +#include "fourdst/composition/atomicSpecies.h" +#include "fourdst/composition/species.h" +#include "fourdst/composition/composition.h" +#include "fourdst/constants/const.h" namespace fourdst::composition { diff --git a/src/composition/meson.build b/src/composition/meson.build index c5efc2b..af706d6 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -1,12 +1,26 @@ -# Define the library -composition_sources = files( - 'private/composition.cpp', +required_headers = [ + 'fourdst/composition/atomicSpecies.h', + 'fourdst/composition/species.h', + 'fourdst/composition/composition.h' +] + +foreach h : required_headers + if not cpp.has_header(h, include_directories: include_directories('include')) + error('libcomposition requires the header file ' + h + ' to be present in the fourdst/composition directory.') + endif +endforeach + +species_weight_dep = declare_dependency( + include_directories: include_directories('include'), ) -composition_headers = files( - 'public/composition.h' +message('✅ libcomposition species_weight dependency declared') + +composition_sources = files( + 'lib/composition.cpp', ) + dependencies = [ species_weight_dep, const_dep, @@ -17,17 +31,20 @@ dependencies = [ # Define the libcomposition library so it can be linked against by other parts of the build system libcomposition = library('composition', composition_sources, - include_directories: include_directories('public'), cpp_args: ['-fvisibility=default'], dependencies: dependencies, install : true) composition_dep = declare_dependency( - include_directories: include_directories('public'), link_with: libcomposition, dependencies: dependencies, sources: composition_sources, ) # Make headers accessible +composition_headers = files( + 'include/fourdst/composition/composition.h', + 'include/fourdst/composition/atomicSpecies.h', + 'include/fourdst/composition/species.h' +) install_headers(composition_headers, subdir : 'fourdst/fourdst/composition') diff --git a/subprojects/libconfig.wrap b/subprojects/libconfig.wrap index dfd7b0e..7e3954d 100644 --- a/subprojects/libconfig.wrap +++ b/subprojects/libconfig.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconfig.git -revision = v1.0.3 +revision = v1.0.6 depth = 1 [provide] diff --git a/subprojects/libconstants.wrap b/subprojects/libconstants.wrap index 764149e..6f952c2 100644 --- a/subprojects/libconstants.wrap +++ b/subprojects/libconstants.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconstants.git -revision = v1.0.5 +revision = v1.0.6 depth = 1 [provide] diff --git a/subprojects/liblogging.wrap b/subprojects/liblogging.wrap index 06fe890..1046961 100644 --- a/subprojects/liblogging.wrap +++ b/subprojects/liblogging.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/liblogging.git -revision = v1.0.5 +revision = v1.0.6 depth = 1 [provide] diff --git a/tests/composition/compositionTest.cpp b/tests/composition/compositionTest.cpp index 5fb7884..605f8c4 100644 --- a/tests/composition/compositionTest.cpp +++ b/tests/composition/compositionTest.cpp @@ -3,10 +3,11 @@ #include #include -#include "atomicSpecies.h" -#include "species.h" -#include "composition.h" -#include "config.h" +#include "fourdst/composition/atomicSpecies.h" +#include "fourdst/composition/species.h" +#include "fourdst/composition/composition.h" + +#include "fourdst/config/config.h" std::string EXAMPLE_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/config/example.yaml"; diff --git a/assets/static/atomic/mass_1.mas20.txt b/utils/atomic/mass_1.mas20.txt similarity index 100% rename from assets/static/atomic/mass_1.mas20.txt rename to utils/atomic/mass_1.mas20.txt