@@ -8,29 +8,17 @@ c = meson.get_compiler('c')
8
8
# Get the conda prefix
9
9
conda_prefix = run_command (' bash' , ' -c' , ' echo $CONDA_PREFIX' , check : true ).stdout().strip()
10
10
11
- message (' Conda prefix: ' + conda_prefix)
12
-
13
- # Add conda lib and include directories
11
+ # Add conda lib directory to library path
14
12
add_project_link_arguments (' -L' + conda_prefix + ' /lib' , language : [' c' , ' cpp' ])
15
- add_project_arguments (' -I' + conda_prefix + ' /include' , language : [' c' , ' cpp' ])
13
+ add_project_link_arguments (' -I' + conda_prefix + ' /include' , language : [' c' , ' cpp' ])
16
14
17
- # Try to find SLEEF using pkg-config first
18
- sleef_dep = dependency ( ' sleef ' , required : false )
15
+ sleef_dep = c. find_library ( ' sleef ' , dirs : [conda_prefix + ' /lib ' ])
16
+ sleefquad_dep = c. find_library ( ' sleefquad ' , dirs : [conda_prefix + ' /lib ' ] )
19
17
20
- if not sleef_dep.found()
21
- # If pkg-config fails, try to find the library manually
22
- sleef_dep = c.find_library (' sleef' , dirs : [conda_prefix + ' /lib' ])
23
- sleefquad_dep = c.find_library (' sleefquad' , dirs : [conda_prefix + ' /lib' ])
24
-
25
- if not sleef_dep.found() or not sleefquad_dep.found()
26
- error (' SLEEF library not found. Please ensure it is installed in your conda environment\n conda install sleef.' )
27
- endif
28
- else
29
- sleefquad_dep = sleef_dep
18
+ if not sleef_dep.found() or not sleefquad_dep.found()
19
+ error (' SLEEF library not found. Please ensure it is installed in your conda environment\n conda install sleef.' )
30
20
endif
31
21
32
- message (' SLEEF library found: ' + sleef_dep.found().to_string())
33
-
34
22
incdir_numpy = run_command (py,
35
23
[
36
24
' -c' ,
@@ -43,7 +31,6 @@ includes = include_directories(
43
31
[
44
32
incdir_numpy,
45
33
' quaddtype/src' ,
46
- conda_prefix + ' /include' ,
47
34
]
48
35
)
49
36
@@ -71,11 +58,10 @@ py.install_sources(
71
58
)
72
59
73
60
py.extension_module(' _quaddtype_main' ,
74
- srcs,
75
- c_args : [' -g' , ' -O0' ],
76
- link_args : [' -lsleef' , ' -lsleefquad' ],
77
- dependencies : [sleef_dep, sleefquad_dep],
78
- install : true ,
79
- subdir : ' quaddtype' ,
80
- include_directories : includes
61
+ srcs,
62
+ c_args : [' -g' , ' -O0' , ' -lsleef' , ' -lsleefquad' ],
63
+ dependencies : [sleef_dep, sleefquad_dep],
64
+ install : true ,
65
+ subdir : ' quaddtype' ,
66
+ include_directories : includes
81
67
)
0 commit comments