Skip to content

Commit

Permalink
Build with Visual Studio 2019
Browse files Browse the repository at this point in the history
  • Loading branch information
bblanchon committed Aug 22, 2020
1 parent a493a68 commit 50ae0b9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ branches:
- /travis/

environment:
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
GYP_MSVS_VERSION: 2019
PDFium_BRANCH: $(APPVEYOR_REPO_TAG_NAME)
matrix:
- PDFium_V8: enabled
Expand Down
4 changes: 2 additions & 2 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
: Variables to provide:
: GYP_MSVS_VERSION = 2017 | 2015
: GYP_MSVS_VERSION = 2019 | 2017 | 2015
: CONFIGURATION = Debug | Release
: PLATFORM = x86 | x64
: PDFium_BRANCH = master | chromium/3211 | ...
: PDFium_V8 = enabled

: Input
set WindowsSDK_DIR=C:\Program Files (x86)\Windows Kits\10\bin\%PLATFORM%
set WindowsSDK_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\%PLATFORM%
set DepotTools_URL=https://storage.googleapis.com/chrome-infra/depot_tools.zip
set DepotTools_DIR=%CD%\depot_tools
set PDFium_URL=https://pdfium.googlesource.com/pdfium.git
Expand Down
7 changes: 4 additions & 3 deletions test.bat
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
set SOURCE_DIR=%CD%\example
set PDFium_DIR=%CD%\staging
set CMAKE_GENERATOR=Visual Studio 15 2017
set CMAKE_GENERATOR=Visual Studio 16 2019

if "%PLATFORM%"=="x64" set CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64
if "%PLATFORM%"=="x64" (set CMAKE_GENERATOR_PLATFORM=x64)
else (set CMAKE_GENERATOR_PLATFORM=Win32)

@echo on

mkdir build
cd build
cmake -G "%CMAKE_GENERATOR%" "%SOURCE_DIR%"
cmake -G "%CMAKE_GENERATOR%" -A "%CMAKE_GENERATOR_PLATFORM%" "%SOURCE_DIR%"
cmake --build .
ctest --output-on-failure .

0 comments on commit 50ae0b9

Please sign in to comment.