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,41 +0,0 @@
|
||||
--- subprojects/mfem/CMakeLists.txt 2025-02-12 15:54:52.454728232 -0500
|
||||
+++ CMakeLists.txt.bak 2025-02-12 16:08:06.654542689 -0500
|
||||
@@ -765,7 +765,7 @@
|
||||
if (MFEM_ENABLE_EXAMPLES)
|
||||
add_subdirectory(examples) #install examples if enabled
|
||||
else()
|
||||
- add_subdirectory(examples EXCLUDE_FROM_ALL)
|
||||
+ # add_subdirectory(examples EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
# Create a target for all miniapps and, optionally, enable it.
|
||||
@@ -774,7 +774,7 @@
|
||||
if (MFEM_ENABLE_MINIAPPS)
|
||||
add_subdirectory(miniapps) #install miniapps if enabled
|
||||
else()
|
||||
- add_subdirectory(miniapps EXCLUDE_FROM_ALL)
|
||||
+ # add_subdirectory(miniapps EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
# Target to build all executables, i.e. everything.
|
||||
@@ -801,19 +801,7 @@
|
||||
add_dependencies(${MFEM_EXEC_PREREQUISITES_TARGET_NAME} copy_data)
|
||||
endif()
|
||||
|
||||
-# Add 'check' target - quick test
|
||||
-set(MFEM_CHECK_TARGET_NAME ${MFEM_CUSTOM_TARGET_PREFIX}check)
|
||||
-if (NOT MFEM_USE_MPI)
|
||||
- add_custom_target(${MFEM_CHECK_TARGET_NAME}
|
||||
- ${CMAKE_CTEST_COMMAND} -R \"^ex1_ser\" -C ${CMAKE_CFG_INTDIR}
|
||||
- USES_TERMINAL)
|
||||
- add_dependencies(${MFEM_CHECK_TARGET_NAME} ex1)
|
||||
-else()
|
||||
- add_custom_target(${MFEM_CHECK_TARGET_NAME}
|
||||
- ${CMAKE_CTEST_COMMAND} -R \"^ex1p\" -C ${CMAKE_CFG_INTDIR}
|
||||
- USES_TERMINAL)
|
||||
- add_dependencies(${MFEM_CHECK_TARGET_NAME} ex1p)
|
||||
-endif()
|
||||
+message(STATUS "MFEM Miniapps and Examples disabled by patch!")
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Documentation
|
||||
@@ -1,13 +1,5 @@
|
||||
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.add_cmake_defines({
|
||||
'MFEM_ENABLE_EXAMPLES': 'OFF',
|
||||
@@ -20,4 +12,4 @@ mfem_sp = cmake.subproject(
|
||||
'mfem',
|
||||
options: mfem_cmake_options)
|
||||
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')
|
||||
|
||||
Reference in New Issue
Block a user