Skip to content

Commit 4994859

Browse files
authored
Merge pull request #21 from ilastik/fix-windows-build
VS2019 nmake based build
2 parents 1a11fa8 + d589665 commit 4994859

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

appveyor.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# have to use Visual Studio 2017 for now
2+
# 2019 version doesn't have compiler tools for older versions installed (on Appveyor)
13
image: Visual Studio 2017
24

35
clone_folder: c:\projects\marching_cubes
@@ -8,6 +10,9 @@ environment:
810
MINICONDA: C:\Miniconda36-x64
911

1012
install:
13+
- >
14+
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
15+
x64 -vcvars_ver=14.1
1116
- set DEV_PREFIX=%MINICONDA%/envs/%ENV_NAME%
1217
- "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
1318
- conda config --set always_yes yes --set changeps1 no

conda-recipe/bld.bat

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ cd build
33

44
set CONFIGURATION=Release
55

6-
cmake .. -G "%CMAKE_GENERATOR%" ^
6+
cmake .. -G "NMake Makefiles" ^
7+
-DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
78
-DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
89
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
910
-DPYTHON_EXECUTABLE="%PYTHON%"
1011

1112
if errorlevel 1 exit 1
1213

13-
cmake --build . --target ALL_BUILD --config %CONFIGURATION%
14+
nmake all
1415
if errorlevel 1 exit 1
1516

16-
cmake --build . --target INSTALL --config %CONFIGURATION%
17+
nmake install
1718
if errorlevel 1 exit 1

0 commit comments

Comments
 (0)