Skip to content

Commit fe8b540

Browse files
committed
fixing CI
1 parent b8132d2 commit fe8b540

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Install quaddtype
7070
working-directory: quaddtype
7171
run: |
72-
LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug -Dsleef_path=/usr"
72+
export SLEEF_PATH=/usr && LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
7373
- name: Run quaddtype tests
7474
working-directory: quaddtype
7575
run: |

quaddtype/meson.build

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,19 @@ if is_windows
2525
sleef_dep = declare_dependency(include_directories: include_directories(sleef_include_dir),
2626
dependencies: [sleef_lib, sleefquad_lib])
2727
else
28-
sleef_path = get_option('sleef_path')
29-
if sleef_path == ''
30-
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
31-
endif
28+
# Linux and macOS configuration
29+
30+
# Get the SLEEF path
31+
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
3232
if sleef_path == ''
3333
sleef_path = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: false).stdout().strip()
3434
endif
35+
3536
if sleef_path == ''
36-
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set, and sleef_path option is not provided')
37+
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set')
3738
endif
3839

39-
message('Using SLEEF path: ' + sleef_path)
40+
add_project_link_arguments('-L' + sleef_path + '/lib', language: ['c', 'cpp'])
4041

4142
sleef_include_dir = sleef_path + '/include'
4243
sleef_library_dir = sleef_path + '/lib'
@@ -49,10 +50,9 @@ else
4950
endif
5051

5152
if not sleef_dep.found() or (not is_windows and not sleefquad_dep.found())
52-
error('SLEEF library not found. Please ensure it is installed in your conda environment or specify the correct path.')
53+
error('SLEEF library not found. Please ensure it is installed in your conda environment.')
5354
endif
5455

55-
5656
# Try to get NumPy include path from environment variable first
5757
if incdir_numpy == ''
5858
incdir_numpy = run_command(py,

0 commit comments

Comments
 (0)