Skip to content

Commit a73575d

Browse files
committed
fixing setup
1 parent 063ef55 commit a73575d

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

.github/workflows/temp.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ jobs:
5151
ls -l "$CONDA_PREFIX/Library/include/sleef.h"
5252
ls -l "$CONDA_PREFIX/Library/lib/sleef"*
5353
54-
- name: Set environment variables
55-
shell: pwsh
56-
run: |
57-
echo "CONDA_PREFIX=$env:CONDA_PREFIX" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
58-
$numpy_path = python -c "import numpy; import os; print(os.path.abspath(numpy.get_include()).replace(os.sep, '/'))"
59-
echo "NUMPY_INCLUDE_DIR=$numpy_path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
60-
6154
- name: Install build dependencies
6255
shell: bash -l {0}
6356
run: |
@@ -66,21 +59,17 @@ jobs:
6659
6760
- name: Build wheels
6861
env:
69-
CONDA_PREFIX: ${{ env.CONDA_PREFIX }}
7062
CIBW_BUILD: 'cp310-* cp311-* cp312-*'
7163
CIBW_SKIP: 'pp* cp36-* cp37-* cp38-* cp39-* cp313-*'
7264
CIBW_ARCHS_WINDOWS: ${{ matrix.architecture == 'x86' && 'x86' || 'AMD64' }}
7365
CIBW_BUILD_VERBOSITY: '1'
74-
SLEEF_INCLUDE_DIR: ${{ env.CONDA_PREFIX }}\Library\include
75-
SLEEF_LIBRARY: ${{ env.CONDA_PREFIX }}\Library\lib
7666
DISTUTILS_USE_SDK: '1'
7767
MSSdk: '1'
78-
NUMPY_INCLUDE_DIR: ${{ env.NUMPY_INCLUDE_DIR }}
79-
CIBW_ENVIRONMENT: >-
80-
NUMPY_INCLUDE_DIR="${{ env.NUMPY_INCLUDE_DIR }}"
81-
SLEEF_INCLUDE_DIR="${{ env.CONDA_PREFIX }}/Library/include"
82-
SLEEF_LIBRARY="${{ env.CONDA_PREFIX }}/Library/lib"
83-
CIBW_BEFORE_BUILD: pip install meson meson-python ninja numpy
68+
CIBW_BEFORE_BUILD: |
69+
pip install meson meson-python ninja numpy
70+
echo %CONDA_PREFIX%
71+
dir %CONDA_PREFIX%\Library\include
72+
dir %CONDA_PREFIX%\Library\lib
8473
CIBW_REPAIR_WHEEL_COMMAND: 'delvewheel repair -w {dest_dir} {wheel}'
8574
CIBW_TEST_COMMAND: |
8675
pip install {package}[test]

quaddtype/meson.build

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,23 @@ is_windows = build_machine.system() == 'windows'
1111

1212
if is_windows
1313
add_project_arguments('-DWIN32', '-D_WINDOWS', language : ['c', 'cpp'])
14-
endif
15-
16-
sleef_dep = [
17-
c.find_library('sleef', required : true),
18-
c.find_library('sleefquad', required : true)
19-
]
14+
15+
conda_prefix = run_command('cmd', '/c', 'echo %CONDA_PREFIX%', check: true).stdout().strip()
16+
sleef_lib_dir = conda_prefix + '\\Library\\lib'
17+
sleef_include_dir = conda_prefix + '\\Library\\include'
2018

19+
add_project_arguments('-I' + sleef_include_dir, language: ['c', 'cpp'])
20+
21+
sleef_dep = [
22+
c.find_library('sleef', dirs : [sleef_lib_dir], required : true),
23+
c.find_library('sleefquad', dirs : [sleef_lib_dir], required : true)
24+
]
25+
else
26+
sleef_dep = [
27+
c.find_library('sleef', required : true),
28+
c.find_library('sleefquad', required : true)
29+
]
30+
endif
2131

2232
incdir_numpy = run_command(py,
2333
['-c', 'import numpy; print(numpy.get_include())'],
@@ -31,6 +41,10 @@ includes = include_directories(
3141
]
3242
)
3343

44+
if is_windows
45+
includes += include_directories(sleef_include_dir)
46+
endif
47+
3448
srcs = [
3549
'numpy_quaddtype/src/quad_common.h',
3650
'numpy_quaddtype/src/casts.h',

0 commit comments

Comments
 (0)