Update Googletest to Release 1.10

Drop support for Visual Studio 2013
This commit is contained in:
Sébastien Rombauts 2019-12-26 18:39:31 +01:00
parent 5a4bc77b39
commit a8a1a2ee44
3 changed files with 46 additions and 47 deletions

View File

@ -73,7 +73,7 @@ And the following IDEs/Compilers
- GCC 4.8.4, 4.9.3, 5.3.0 and 6.1.1 (C++03, C++11, C++14, C++1z) - GCC 4.8.4, 4.9.3, 5.3.0 and 6.1.1 (C++03, C++11, C++14, C++1z)
- Clang 3.5 and 3.8 - Clang 3.5 and 3.8
- Xcode 8 - Xcode 8
- Visual Studio Community 2019, 2017, and VS 2013 & 2015 (AppVeyor) - Visual Studio Community 2019, 2017, and 2015 (AppVeyor)
### Dependencies ### Dependencies

View File

@ -1,45 +1,44 @@
# Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com) # Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com)
# build format # build format
version: "{build}" version: "{build}"
# scripts that run after cloning repository # scripts that run after cloning repository
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive
image: image:
- Visual Studio 2019 - Visual Studio 2019
- Visual Studio 2017 - Visual Studio 2017
- Visual Studio 2015 - Visual Studio 2015
- Visual Studio 2013
# configurations to add to build matrix
# configurations to add to build matrix # TODO: MinGW Makefiles and MSYS Makefiles
# TODO: MinGW Makefiles and MSYS Makefiles configuration:
configuration: - Debug
- Debug - Release
- Release
environment:
environment: matrix:
matrix: - arch: Win32
- arch: Win32 - arch: x64
- arch: x64
init:
init: - echo %APPVEYOR_BUILD_WORKER_IMAGE% - %configuration% - %arch%
- echo %APPVEYOR_BUILD_WORKER_IMAGE% - %configuration% - %arch% - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set vs=Visual Studio 15 2017)
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set vs=Visual Studio 15 2017) - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set vs=Visual Studio 14 2015)
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set vs=Visual Studio 14 2015) - if "%arch%"=="x64" (set generator="%vs% Win64") else (set generator="%vs%")
- if "%arch%"=="x64" (set generator="%vs% Win64") else (set generator="%vs%") # CMake uses a different grammar for Visual Studio 2019, with -A to specify architecture:
# CMake uses a different grammar for Visual Studio 2019, with -A to specify architecture: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (set generator="Visual Studio 16 2019" -A %arch%)
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (set generator="Visual Studio 16 2019" -A %arch%) - echo %generator%
- echo %generator%
# scripts to run before build
# scripts to run before build before_build:
before_build: - mkdir build
- mkdir build - cd build
- cd build - cmake -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON -DSQLITECPP_RUN_CPPCHECK=OFF .. -G %generator%
- cmake -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON -DSQLITECPP_RUN_CPPCHECK=OFF .. -G %generator%
# build examples, and run tests (ie make & make test)
# build examples, and run tests (ie make & make test) build_script:
build_script: - cmake --build . --config %configuration%
- cmake --build . --config %configuration% - ctest --output-on-failure
- ctest --output-on-failure

@ -1 +1 @@
Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e