Skip to content

Commit 259225c

Browse files
committed
adding more dep
1 parent dbe02ec commit 259225c

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

quaddtype/meson.build

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal'
2525
# SLEEF found system-wide - verify quad-precision support
2626
cpp = meson.get_compiler('cpp')
2727
sleefquad_lib = cpp.find_library('sleefquad', required: false)
28+
tlfloat_lib = cpp.find_library('tlfloat', required: false)
2829

29-
if sleefquad_lib.found()
30+
if sleefquad_lib.found() and tlfloat_lib.found()
3031
sleefquad_test_code = '''
3132
#include <sleefquad.h>
3233
@@ -40,13 +41,13 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal'
4041
# this should compile and link
4142
quad_works = cpp.links(
4243
sleefquad_test_code,
43-
dependencies: [sleef_dep, sleefquad_lib],
44+
dependencies: [sleef_dep, sleefquad_lib, tlfloat_lib],
4445
name: 'SLEEF quad-precision support'
4546
)
4647

4748
if quad_works
4849
sleefquad_dep = declare_dependency(
49-
dependencies: [sleef_dep, sleefquad_lib]
50+
dependencies: [sleef_dep, sleefquad_lib, tlfloat_lib]
5051
)
5152
use_system_sleef = true
5253
else
@@ -65,6 +66,7 @@ else
6566
sleef_subproj = subproject('sleef')
6667
sleef_dep = sleef_subproj.get_variable('sleef_dep')
6768
sleefquad_dep = sleef_subproj.get_variable('sleefquad_dep')
69+
tlfloat_dep = sleef_subproj.get_variable('tlfloat_dep')
6870
warning(fallback_reason)
6971
message('Proceeding with vendored SLEEF subproject instead')
7072
endif
@@ -84,7 +86,7 @@ message('Using NumPy version: @0@'.format(numpy_version))
8486
npymath_path = incdir_numpy / '..' / 'lib'
8587
npymath_lib = c.find_library('npymath', dirs: npymath_path)
8688

87-
dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, npymath_lib]
89+
dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, tlfloat_dep, npymath_lib]
8890

8991
# Add OpenMP dependency (optional, for threading)
9092
openmp_dep = dependency('openmp', required: false, static: false)

quaddtype/subprojects/packagefiles/sleef/meson.build

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project('sleef', version: '3.8')
1+
project('sleef')
22

33
cmake = find_program('cmake')
44
ninja = find_program('ninja', 'make', required: false)
@@ -62,4 +62,10 @@ sleefquad_dep = declare_dependency(
6262
dependencies: [sleef_build_dep],
6363
compile_args: compile_args_list,
6464
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-lsleefquad']
65+
)
66+
67+
tlfloat_dep = declare_dependency(
68+
dependencies: [sleef_build_dep],
69+
compile_args: compile_args_list,
70+
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-ltlfloat']
6571
)

quaddtype/subprojects/sleef.wrap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[wrap-git]
22
directory=sleef
33
url=https://github.com/shibatch/sleef.git
4-
revision=3.8
54
patch_directory=sleef
65

76
[provide]

0 commit comments

Comments
 (0)