Skip to content

Commit

Permalink
appveyor: move to VS2017
Browse files Browse the repository at this point in the history
  • Loading branch information
julianoes committed Oct 31, 2017
1 parent 9741cd9 commit fc914a3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions appveyor.yml
Expand Up @@ -2,7 +2,7 @@
version: "{build}"

# Operating system (build VM template)
os: Visual Studio 2015
os: Visual Studio 2017

# build platform, i.e. Win32 (instead of x86), x64, Any CPU. This setting is optional.
platform:
Expand Down Expand Up @@ -33,26 +33,26 @@ before_build:
- cd C:\dronecore
- git submodule update --init --recursive --depth 20
- cd C:\
- appveyor DownloadFile https://curl.haxx.se/download/curl-7.55.1.zip
- 7z x -y curl-7.55.1.zip
- appveyor DownloadFile https://curl.haxx.se/download/curl-7.56.1.zip
- 7z x -y curl-7.56.1.zip

build: on

build_script:
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- call "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" amd64
- cd curl-7.55.1\winbuild
- if "%configuration%"=="Debug" (
nmake /f Makefile.vc mode=static VC=14 MACHINE=x64 DEBUG=yes
nmake /f Makefile.vc mode=static VC=15 MACHINE=x64 DEBUG=yes
) else (
nmake /f Makefile.vc mode=static VC=14 MACHINE=x64 DEBUG=no
nmake /f Makefile.vc mode=static VC=15 MACHINE=x64 DEBUG=no
)
- cd C:\dronecore
- md build
- cd build
- if "%configuration%"=="Debug" (
cmake -DWIN_CURL_INCLUDE_DIR:STRING="C:\curl-7.55.1\include" -DWIN_CURL_LIB:STRING="C:\curl-7.55.1\builds\libcurl-vc14-x64-debug-static-ipv6-sspi-winssl\lib\libcurl_a_debug.lib" -G "Visual Studio 14 2015 Win64" ..
cmake -DWIN_CURL_INCLUDE_DIR:STRING="C:\curl-7.55.1\include" -DWIN_CURL_LIB:STRING="C:\curl-7.55.1\builds\libcurl-vc15-x64-debug-static-ipv6-sspi-winssl\lib\libcurl_a_debug.lib" -G "Visual Studio 15 2017 Win64" ..
) else (
cmake -DWIN_CURL_INCLUDE_DIR:STRING="C:\curl-7.55.1\include" -DWIN_CURL_LIB:STRING="C:\curl-7.55.1\builds\libcurl-vc14-x64-release-static-ipv6-sspi-winssl\lib\libcurl_a.lib" -G "Visual Studio 14 2015 Win64" -DBUILD_SHARED_LIBS=OFF ..
cmake -DWIN_CURL_INCLUDE_DIR:STRING="C:\curl-7.55.1\include" -DWIN_CURL_LIB:STRING="C:\curl-7.55.1\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl\lib\libcurl_a.lib" -G "Visual Studio 15 2017 Win64" -DBUILD_SHARED_LIBS=OFF ..
)
- if "%configuration%"=="Debug" (
cmake --build . --target install --config Debug
Expand Down

0 comments on commit fc914a3

Please sign in to comment.