Skip to content

Commit 7a21878

Browse files
author
Panos
committed
Updated appveyor cfg and scripts
1 parent 1fd4f51 commit 7a21878

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ build:
33
parallel: true
44
verbosity: minimal
55
skip_branch_with_pr: true
6+
image: Visual Studio 2019
67

78
environment:
89
global:
@@ -18,7 +19,6 @@ environment:
1819
# Python versions to build wheels for
1920
PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64
2021
PYTHON_ARCH: "64"
21-
MSVC: "Visual Studio 14 Win64"
2222

2323
install:
2424
# If there is a newer build queued for the same PR, cancel this one.

ci/appveyor/build_ssh.bat

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)
33
mkdir src
44
cd src
55

6-
set CMAKE_PLATFORM="%MSVC%"
7-
8-
cmake ..\libssh -G %CMAKE_PLATFORM% ^
6+
cmake ..\libssh ^
97
-DCMAKE_BUILD_TYPE=Release ^
108
-DZLIB_LIBRARY=C:/zlib/lib/zlibstatic.lib ^
119
-DZLIB_INCLUDE_DIR=C:/zlib/include ^

ci/appveyor/build_zlib.bat

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,10 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)
22

33
mkdir zlib_build && cd zlib_build
44

5-
IF "%MSVC%" == "Visual Studio 9" (
6-
ECHO "Building without platform set"
7-
cmake ..\zlib-1.2.11 -G "NMake Makefiles" ^
8-
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
9-
-DCMAKE_BUILD_TYPE=Release ^
10-
-DBUILD_SHARED_LIBS=OFF
11-
) ELSE (
12-
ECHO "Building with platform %MSVC%"
13-
cmake ..\zlib-1.2.11 ^
14-
-G"%MSVC%" ^
15-
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
16-
-DCMAKE_BUILD_TYPE=Release ^
17-
-DBUILD_SHARED_LIBS=OFF
5+
cmake ..\zlib-1.2.11 ^
6+
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
7+
-DCMAKE_BUILD_TYPE=Release ^
8+
-DBUILD_SHARED_LIBS=OFF
189
)
1910

2011
cmake --build . --config Release --target install

0 commit comments

Comments
 (0)