From 2db3d6e666bbea9bd41b84db76b464250c68c89d Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Sat, 31 Jan 2026 10:39:55 -0500 Subject: [PATCH] fix(linux): fixed linux compilation --- build-config/mfem/meson.build | 5 +++-- subprojects/libconfig.wrap | 4 ++-- tests/meson.build | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build-config/mfem/meson.build b/build-config/mfem/meson.build index 30df8ca..4a6c646 100644 --- a/build-config/mfem/meson.build +++ b/build-config/mfem/meson.build @@ -5,9 +5,10 @@ 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' + 'BUILD_SHARED_LIBS': 'OFF', + 'BUILD_STATIC_LIBS': 'ON', }) +mfem_cmake_options.set_install(true) mfem_sp = cmake.subproject( 'mfem', diff --git a/subprojects/libconfig.wrap b/subprojects/libconfig.wrap index 1714de6..86267ec 100644 --- a/subprojects/libconfig.wrap +++ b/subprojects/libconfig.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/4D-STAR/libconfig.git -revision = v2.0.4 -depth = 1 \ No newline at end of file +revision = v2.0.5 +depth = 1 diff --git a/tests/meson.build b/tests/meson.build index b5a6dd5..4eb5fc6 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,7 @@ gtest_dep = dependency('gtest', main: true, required : true) gtest_main = dependency('gtest_main', required: true) gtest_nomain_dep = dependency('gtest', main: false, required : true) +threads_dep = dependency('threads') # Test files for const test_sources = [ @@ -14,6 +15,7 @@ foreach test_file : test_sources exe_name, test_file, dependencies: [ + threads_dep, stroid_dep, gtest_dep, gtest_main