File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14,16 +14,10 @@ environment:
1414 - MINICONDA : C:\Miniconda36-x64
1515 FFTW_INSTALL_MODE : conda-forge
1616 FFTW_ROOT :
17- - MINICONDA : C:\Miniconda36
18- FFTW_INSTALL_MODE : conda-forge
19- FFTW_ROOT :
2017 # fftw from the "official" fftw website build
2118 - MINICONDA : C:\Miniconda36-x64
2219 FFTW_INSTALL_MODE : official
2320 FFTW_ROOT : C:\fftw_download
24- - MINICONDA : C:\Miniconda36
25- FFTW_INSTALL_MODE : official
26- FFTW_ROOT : C:\fftw_download
2721
2822matrix :
2923 exclude :
@@ -42,12 +36,12 @@ install:
4236 - conda config --add channels conda-forge
4337 - conda update -q conda
4438 - conda info -a
45- - conda install xtensor
39+ - conda install xtensor=0.21.2 -c conda-forge
4640 - IF "%FFTW_INSTALL_MODE%"=="official" ( Powershell.exe -File appveyor_install_fftw.ps1 ) ELSE IF "%FFTW_INSTALL_MODE%"=="conda-forge" ( conda install fftw )
4741 - cd %APPVEYOR_BUILD_FOLDER%
4842 - mkdir build
4943 - cd build
50- - cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DFFTW_ROOT=%FFTW_ROOT% -DCMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -DBUILD_TESTS=ON - DDOWNLOAD_GTEST=ON ..
44+ - cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DFFTW_ROOT=%FFTW_ROOT% -DCMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -DDOWNLOAD_GTEST=ON ..
5145 - nmake test_xtensor-fftw
5246
5347before_build :
Original file line number Diff line number Diff line change @@ -148,15 +148,15 @@ install:
148148 - export PATH="$HOME/miniconda/bin:$PATH"
149149 - hash -r
150150 - conda update -yq conda
151- - conda install -y cmake xtl==0.6.7 xtensor=0.20.10 nlohmann_json=3.7.1 -c conda-forge
151+ - conda install -y cmake xtl==0.6.9 xtensor=0.21.2 nlohmann_json=3.7.1 -c conda-forge
152152 - |
153153 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
154154 conda install -y fftw -c conda-forge
155155 fi
156156 # Testing
157157 - mkdir $TRAVIS_BUILD_DIR/build
158158 - cd $TRAVIS_BUILD_DIR/build
159- - cmake -DBUILD_TESTS=ON - DDOWNLOAD_GTEST=ON -DCOVERAGE=$COVERAGE ..
159+ - cmake -DDOWNLOAD_GTEST=ON -DCOVERAGE=$COVERAGE ..
160160 - make -j2 test_xtensor-fftw VERBOSE=1
161161 - if [[ "$COVERAGE" == "ON" ]]; then gem install coveralls-lcov; fi
162162script :
Original file line number Diff line number Diff line change @@ -65,12 +65,14 @@ set(CMAKE_CXX_EXTENSIONS NO)
6565include_directories (${XTENSOR_FFTW_INCLUDE_DIR} )
6666
6767# .. xtensor
68- find_package (xtensor REQUIRED )
68+ set (xtensor_REQUIRED_VERSION 0.21.2)
69+ find_package (xtensor ${xtensor_REQUIRED_VERSION} REQUIRED )
6970message (STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS} /xtensor" )
7071include_directories (${xtensor_INCLUDE_DIRS} )
7172
7273# .. xtl
73- find_package (xtl REQUIRED )
74+ set (xtl_REQUIRED_VERSION 0.6.9)
75+ find_package (xtl ${xtl_REQUIRED_VERSION} REQUIRED )
7476message (STATUS "Found xtl: ${xtl_INCLUDE_DIRS} /xtl" )
7577include_directories (${xtl_INCLUDE_DIRS} )
7678
@@ -163,4 +165,4 @@ configure_file(${PROJECT_NAME}.pc.in
163165 "${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} .pc"
164166 @ONLY )
165167install (FILES "${CMAKE_CURRENT_BINARY_DIR} /${PROJECT_NAME} .pc"
166- DESTINATION "${CMAKE_INSTALL_LIBDIR} /pkgconfig/" )
168+ DESTINATION "${CMAKE_INSTALL_LIBDIR} /pkgconfig/" )
Original file line number Diff line number Diff line change @@ -46,6 +46,10 @@ make install
4646* [ FFTW] ( http://www.fftw.org/ ) version 3
4747* A compiler supporting C++14
4848
49+ | ` xtensor-fftw ` | ` xtensor ` | ` xtl ` | ` fftw ` |
50+ | ----------------| -----------| ---------| ---------|
51+ | master | ^0.20.10 | ^0.6.7 | ^3.3.8 |
52+
4953## Usage
5054
5155_ xtensor-fftw_ is a header-only library.
You can’t perform that action at this time.
0 commit comments