@@ -10,23 +10,6 @@ platform:
1010
1111environment :
1212 matrix :
13- # fftw from the "official" fftw website build
14- - COLUMN_MAJOR_LAYOUT : OFF
15- MINICONDA : C:\Miniconda36-x64
16- FFTW_INSTALL_MODE : official
17- FFTW_ROOT : C:\fftw_download
18- - COLUMN_MAJOR_LAYOUT : OFF
19- MINICONDA : C:\Miniconda36
20- FFTW_INSTALL_MODE : official
21- FFTW_ROOT : C:\fftw_download
22- - COLUMN_MAJOR_LAYOUT : ON
23- MINICONDA : C:\Miniconda36-x64
24- FFTW_INSTALL_MODE : official
25- FFTW_ROOT : C:\fftw_download
26- - COLUMN_MAJOR_LAYOUT : ON
27- MINICONDA : C:\Miniconda36
28- FFTW_INSTALL_MODE : official
29- FFTW_ROOT : C:\fftw_download
3013 # fftw from conda-forge
3114 - COLUMN_MAJOR_LAYOUT : OFF
3215 MINICONDA : C:\Miniconda36-x64
@@ -44,6 +27,23 @@ environment:
4427 MINICONDA : C:\Miniconda36
4528 FFTW_INSTALL_MODE : conda-forge
4629 FFTW_ROOT :
30+ # fftw from the "official" fftw website build
31+ - COLUMN_MAJOR_LAYOUT : OFF
32+ MINICONDA : C:\Miniconda36-x64
33+ FFTW_INSTALL_MODE : official
34+ FFTW_ROOT : C:\fftw_download
35+ - COLUMN_MAJOR_LAYOUT : OFF
36+ MINICONDA : C:\Miniconda36
37+ FFTW_INSTALL_MODE : official
38+ FFTW_ROOT : C:\fftw_download
39+ - COLUMN_MAJOR_LAYOUT : ON
40+ MINICONDA : C:\Miniconda36-x64
41+ FFTW_INSTALL_MODE : official
42+ FFTW_ROOT : C:\fftw_download
43+ - COLUMN_MAJOR_LAYOUT : ON
44+ MINICONDA : C:\Miniconda36
45+ FFTW_INSTALL_MODE : official
46+ FFTW_ROOT : C:\fftw_download
4747
4848 # TODO: conda-forge build doen, CMakeLists aanpassen zodat FFTW_LONGDOUBLE niet required is bij CMAKE_CXX_COMPILER_ID == MSVC
4949 # sowieso is libs requiren beetje raar als je alleen installeert;
@@ -58,7 +58,7 @@ matrix:
5858 MINICONDA : C:\Miniconda36
5959 allow_failures :
6060 - COLUMN_MAJOR_LAYOUT : ON
61- # fast_finish: true
61+ fast_finish : true
6262
6363init :
6464 - C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat %PLATFORM%
0 commit comments