tboudreaux/SERiF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23 from tboudreaux/fix/mfemCMakePatch

Browse Source 
fix(build): using mesons built in patch system
This commit is contained in:
Emily Boudreaux
2025-03-13 14:19:13 -04:00
committed by GitHub
parent adcd64affb 016382ea4f
commit 7a45f36619
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build-config/mfem/meson.build
View File

@@ -1,13 +1,5 @@
patchFile = files('disable_mfem_selfcheck.patch') patchFile = files('disable_mfem_selfcheck.patch')
patch_check = run_command('grep', '-q', 'MFEM_CHECK_TARGET_NAME', 'subprojects/mfem/CMakeLists.txt', check: false)
if patch_check.returncode() == 0
message('Patching MFEM CMakeLists.txt to remove self checks')
run_command('patch', '-p4', '-d', '../../subprojects/mfem', '-i', patchFile[0].full_path(), check: true)
else
message('MFEM CMakeLists.txt already patched')
endif
mfem_cmake_options = cmake.subproject_options() mfem_cmake_options = cmake.subproject_options()
mfem_cmake_options.add_cmake_defines({ mfem_cmake_options.add_cmake_defines({
'MFEM_ENABLE_EXAMPLES': 'OFF', 'MFEM_ENABLE_EXAMPLES': 'OFF',

1
subprojects/mfem.wrap
View File

@@ -1,5 +1,6 @@
[wrap-git] [wrap-git]
url = https://github.com/mfem/mfem.git url = https://github.com/mfem/mfem.git
revision = master revision = master
diff_files = mfem/disable_mfem_selfcheck.patch
[cmake] [cmake]

2
build-config/mfem/disable_mfem_selfcheck.patch → subprojects/packagefiles/mfem/disable_mfem_selfcheck.patch
View File

@@ -1,4 +1,4 @@
--- subprojects/mfem/CMakeLists.txt 2025-02-12 15:54:52.454728232 -0500 --- mfem/CMakeLists.txt 2025-02-12 15:54:52.454728232 -0500
+++ CMakeLists.txt.bak 2025-02-12 16:08:06.654542689 -0500 +++ CMakeLists.txt.bak 2025-02-12 16:08:06.654542689 -0500
@@ -765,7 +765,7 @@ @@ -765,7 +765,7 @@
if (MFEM_ENABLE_EXAMPLES) if (MFEM_ENABLE_EXAMPLES)