diff --git a/.gitignore b/.gitignore index 77b7f3d..17b605d 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ subprojects/tetgen/ subprojects/yaml-cpp/ subprojects/quill/ subprojects/googletest-1.15.2/ +subprojects/opat-core/ .vscode/ diff --git a/build-config/meson.build b/build-config/meson.build index d800bdd..f7f6466 100644 --- a/build-config/meson.build +++ b/build-config/meson.build @@ -3,4 +3,5 @@ cmake = import('cmake') subdir('mfem') subdir('yaml-cpp') subdir('quill') -subdir('boost') \ No newline at end of file +subdir('boost') +subdir('opatIO') diff --git a/build-config/opatIO/meson.build b/build-config/opatIO/meson.build new file mode 100644 index 0000000..3bdb91b --- /dev/null +++ b/build-config/opatIO/meson.build @@ -0,0 +1,2 @@ +opatio_dep = dependency('opatio', fallback: ['opat-core', 'opatio_dep']) + diff --git a/src/meson.build b/src/meson.build index 54fbee7..6768b33 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,11 +11,11 @@ subdir('dobj') # Asset Libraries subdir('eos') -subdir('opatIO') +# subdir('opatIO') subdir('meshIO') # Resouce Manager Libraries subdir('resource') # Physics Libraries -subdir('network') \ No newline at end of file +subdir('network') diff --git a/subprojects/opat-core.wrap b/subprojects/opat-core.wrap new file mode 100644 index 0000000..8f61d3e --- /dev/null +++ b/subprojects/opat-core.wrap @@ -0,0 +1,8 @@ +[wrap-git] +url = https://github.com/4D-STAR/opat-core +revision = main +depth = 1 + + +[provide] +dependency_names = opatio_dep diff --git a/tests/opatIO/meson.build b/tests/opatIO/meson.build index 9d09b39..eeff066 100644 --- a/tests/opatIO/meson.build +++ b/tests/opatIO/meson.build @@ -13,9 +13,7 @@ foreach test_file : test_sources test_exe = executable( exe_name, test_file, - dependencies: [gtest_dep, picosha2_dep, gtest_main], - include_directories: include_directories('../../src/opatIO/public'), - link_with: libopatIO, # Link the dobj library + dependencies: [gtest_dep, picosha2_dep, gtest_main, opatio_dep], install_rpath: '@loader_path/../../src' # Ensure runtime library path resolves correctly )