Merge pull request #1365 from xoviat/patch-1

[appveyor] use cmake from conda forge
This commit is contained in:
Martin Kroeker 2017-11-22 21:13:41 +01:00 committed by GitHub
commit b18730f9e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions

View File

@ -37,12 +37,8 @@ environment:
install:
- if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev ninja cmake
- if [%WITH_FORTRAN%]==[yes] conda install --yes --quiet flang
- if [%WITH_FORTRAN%]==[yes] conda config --add channels isuruf/label/flang --force
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet ninja cmake
- if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- if [%COMPILER%]==[clang-cl] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
- if [%COMPILER%]==[clang-cl] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"