Skip to content

Commit 1a1693d

Browse files
authored
Merge pull request #2113 from su2code/fix_mpp_arm
fix build with mutation++ on Arm architectures
2 parents b7c1577 + 784f703 commit 1a1693d

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

meson.build

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,14 @@ endforeach
245245
catch2_dep = declare_dependency(include_directories: 'externals/catch2/')
246246

247247
if get_option('enable-mpp')
248-
if build_machine.cpu_family() == 'x86' or build_machine.cpu_family() == 'x86_64'
249-
cmake = import('cmake')
250-
cmake_opts = cmake.subproject_options()
251-
cmake_opts.set_override_option('warning_level', '0')
252-
cmake_opts.add_cmake_defines({
253-
'CMAKE_MAKE_PROGRAM': join_paths(meson.project_source_root(), 'ninja'),
254-
'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'
255-
})
256-
cmake_opts.set_install(get_option('install-mpp'))
257-
endif
248+
cmake = import('cmake')
249+
cmake_opts = cmake.subproject_options()
250+
cmake_opts.set_override_option('warning_level', '0')
251+
cmake_opts.add_cmake_defines({
252+
'CMAKE_MAKE_PROGRAM': join_paths(meson.project_source_root(), 'ninja'),
253+
'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'
254+
})
255+
cmake_opts.set_install(get_option('install-mpp'))
258256
mpp_subproj = cmake.subproject('Mutationpp', options: cmake_opts)
259257
mpp_dep = mpp_subproj.dependency('mutation++')
260258
su2_deps += mpp_dep

0 commit comments

Comments
 (0)