Skip to content

Commit e14de3c

Browse files
committed
Merge branch 'issue123-tests-appveyor' into develop
2 parents 46d527d + 0fe2a2e commit e14de3c

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

appveyor.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,28 @@ os: Visual Studio 2015
88
clone_folder: c:\projects\gameboycore
99

1010
environment:
11-
GTEST_ROOT: c:\libs\googletest
12-
11+
VCPKG_TOOLCHAIN: c:\tools\vcpkg\scripts\buildsystems\vcpkg.cmake
12+
1313
configuration:
1414
- Release
1515

1616
install:
17-
- echo "Installing Google Test"
18-
- git clone --depth=1 https://github.com/google/googletest.git c:\tmp\googletest
19-
- cd c:\tmp\googletest
20-
- mkdir build && cd build
21-
- cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=c:\libs\googletest
22-
- msbuild googletest-distribution.sln /verbosity:quiet
23-
- msbuild INSTALL.vcxproj /verbosity:quiet
24-
- set PATH=%PATH%;%GTEST_ROOT%\lib
17+
- cd c:\tools\vcpkg
18+
- vcpkg install gtest
19+
- vcpkg integrate install
2520

2621
before_build:
2722
- cd c:\projects\gameboycore
2823
- mkdir build && cd build
29-
- cmake .. -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="OFF"
24+
- cmake .. -DBUILD_TESTS="ON" -DBUILD_EXAMPLE="OFF" -DBUILD_DOCS="OFF" -DCMAKE_TOOLCHAIN_FILE=%VCPKG_TOOLCHAIN%
3025

3126
build:
3227
project: c:\projects\gameboycore\build\gameboycore.sln
3328
verbosity: minimal
3429

3530
after_build:
36-
- C:\projects\gameboycore\build\tests\Release\gameboy_tests.exe
31+
- cd C:\projects\gameboycore\build
32+
- cmake --build . --target check
3733
- msbuild C:\projects\gameboycore\build\PACKAGE.vcxproj /verbosity:quiet
3834

3935
artifacts:

0 commit comments

Comments
 (0)