fix(build): using mesons built in patch system
the previous custom patch system failed based on order sometimes. We now use mesons build in patch system which guarenees patch order application
This commit is contained in:
@@ -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',
|
||||||
@@ -20,4 +12,4 @@ mfem_sp = cmake.subproject(
|
|||||||
'mfem',
|
'mfem',
|
||||||
options: mfem_cmake_options)
|
options: mfem_cmake_options)
|
||||||
mfem_dep = mfem_sp.dependency('mfem')
|
mfem_dep = mfem_sp.dependency('mfem')
|
||||||
add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/mfem/__CMake_build/config', language: 'cpp')
|
add_project_arguments('-I' + meson.current_build_dir() + '/subprojects/mfem/__CMake_build/config', language: 'cpp')
|
||||||
|
|||||||
@@ -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]
|
||||||
|
|||||||
@@ -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)
|
||||||
Reference in New Issue
Block a user