From b1ab8f53cd0e319e0dc8b412fa417f285c79e8f1 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 26 Dec 2025 10:38:21 +0100 Subject: [PATCH] Fix primecount dependency check --- meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 1063278..4541dfb 100644 --- a/meson.build +++ b/meson.build @@ -15,11 +15,14 @@ cmake = import('cmake') # Compilers cxx = meson.get_compiler('cpp') -# Build bundled primecount with PIC so it can link into the Python extension. -primecount_opts = cmake.subproject_options() -primecount_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'}) -primecount_proj = cmake.subproject('primecount', options: primecount_opts) -primecount_dep = primecount_proj.dependency('libprimecount-static') +primecount_dep = dependency('primecount', required: false, version: '>=8.0.0') +if not primecount_dep.found() + # Build bundled primecount with PIC so it can link into the Python extension. + primecount_opts = cmake.subproject_options() + primecount_opts.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'}) + primecount_proj = cmake.subproject('primecount', options: primecount_opts) + primecount_dep = primecount_proj.dependency('libprimecount-static') +endif inc_cysignals = run_command( py, [