Skip to content

Commit 2064cd5

Browse files
authored
Merge pull request #11 from ilastik/fix-win
Fix windows build
2 parents 794e34c + 7224b24 commit 2064cd5

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
miniforge-version: latest
2727
conda-solver: libmamba
2828
- name: install common dependencies
29-
run: mamba install -n base -c conda-forge conda-build -y
29+
run: conda install -n base -c conda-forge conda-build -y
3030
- name: linux conda build
3131
if: matrix.os == 'ubuntu-latest'
3232
shell: bash -l {0}

conda-recipe/bld.bat

-19
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ cd build
33

44
set CONFIGURATION=Release
55

6-
REM set LINKER_FLAGS="-L${PREFIX}/lib"
7-
REM set DYLIB="dylib"
8-
REM if [ `uname` != "Darwin" ]; then
9-
REM LINKER_FLAGS="-Wl,-rpath-link,${PREFIX}/lib ${LINKER_FLAGS}"
10-
REM set DYLIB="so"
11-
REM fi
12-
136
cmake .. -G "NMake Makefiles" ^
147
-DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
158
-DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
@@ -21,18 +14,6 @@ cmake .. -G "NMake Makefiles" ^
2114

2215
if errorlevel 1 exit 1
2316

24-
REM cmake .. \
25-
REM -DCMAKE_C_COMPILER=${PREFIX}/bin/gcc \
26-
REM -DCMAKE_CXX_COMPILER=${PREFIX}/bin/g++ \
27-
REM -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
28-
REM -DCMAKE_INSTALL_PREFIX=${PREFIX} \
29-
REM -DCMAKE_BUILD_TYPE=Release \
30-
REM -DPYTHON_EXECUTABLE=${PYTHON} \
31-
REM -DPYTHON_LIBRARY=${PREFIX}/lib/libpython2.7.${DYLIB} \
32-
REM -DPYTHON_INCLUDE_DIR=${PREFIX}/include/python2.7 \
33-
REM -DPYTHON_INCLUDE_DIR2=${PREFIX}/include/python2.7 \
34-
REM -DWITH_LOG=OFF
35-
3617
nmake all
3718
if errorlevel 1 exit 1
3819

conda-recipe/conda_build_config.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
c_compiler:
2+
- gcc # [linux]
3+
- clang # [osx]
4+
- vs2019 # [win and x86_64]
5+
c_compiler_version: # [unix]
6+
- 13 # [linux]
7+
- 18 # [osx]
8+
9+
c_stdlib:
10+
- sysroot # [linux]
11+
- macosx_deployment_target # [osx]
12+
- vs # [win]
13+
c_stdlib_version: # [unix]
14+
- 2.17 # [linux]
15+
- 10.13 # [osx and x86_64]
16+
- 11.0 # [osx and arm64]
17+
cxx_compiler:
18+
- gxx # [linux]
19+
- clangxx # [osx]
20+
- vs2019 # [win and x86_64]
21+
cxx_compiler_version: # [unix]
22+
- 13 # [linux]
23+
- 18 # [osx]
24+
125
boost:
226
- 1.86.0
327
lemon:

conda-recipe/meta.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ source:
1515

1616
build:
1717
number: 0
18-
string: py{{CONDA_PY}}_{{PKG_BUILDNUM}}_h{{PKG_HASH}}_g{{GIT_FULL_HASH[:7]}}
1918
skip:
2019
true # [py2k]
2120

@@ -33,6 +32,8 @@ requirements:
3332
- libboost-python-devel {{ boost }}*
3433
- lemon {{ lemon }}*
3534
- python
35+
run:
36+
- python
3637

3738
test:
3839
source_files:

0 commit comments

Comments
 (0)