From a8a1a2ee4496a8381ad4b926b36d0069d6f0ce46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Thu, 26 Dec 2019 18:39:31 +0100 Subject: [PATCH] Update Googletest to Release 1.10 Drop support for Visual Studio 2013 --- README.md | 2 +- appveyor.yml | 89 ++++++++++++++++++++++++++-------------------------- googletest | 2 +- 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index f9ab267..8dc8876 100644 --- a/README.md +++ b/README.md @@ -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) - Clang 3.5 and 3.8 - Xcode 8 -- Visual Studio Community 2019, 2017, and VS 2013 & 2015 (AppVeyor) +- Visual Studio Community 2019, 2017, and 2015 (AppVeyor) ### Dependencies diff --git a/appveyor.yml b/appveyor.yml index 14197ed..78638b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,45 +1,44 @@ -# Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com) - -# build format -version: "{build}" - -# scripts that run after cloning repository -install: - - git submodule update --init --recursive - -image: - - Visual Studio 2019 - - Visual Studio 2017 - - Visual Studio 2015 - - Visual Studio 2013 - -# configurations to add to build matrix -# TODO: MinGW Makefiles and MSYS Makefiles -configuration: - - Debug - - Release - -environment: - matrix: - - arch: Win32 - - arch: x64 - -init: - - 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 2015" (set vs=Visual Studio 14 2015) - - 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: - - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (set generator="Visual Studio 16 2019" -A %arch%) - - echo %generator% - -# scripts to run before build -before_build: - - mkdir build - - cd build - - 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_script: - - cmake --build . --config %configuration% - - ctest --output-on-failure +# Copyright (c) 2012-2020 Sebastien Rombauts (sebastien.rombauts@gmail.com) + +# build format +version: "{build}" + +# scripts that run after cloning repository +install: + - git submodule update --init --recursive + +image: + - Visual Studio 2019 + - Visual Studio 2017 + - Visual Studio 2015 + +# configurations to add to build matrix +# TODO: MinGW Makefiles and MSYS Makefiles +configuration: + - Debug + - Release + +environment: + matrix: + - arch: Win32 + - arch: x64 + +init: + - 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 2015" (set vs=Visual Studio 14 2015) + - 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: + - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (set generator="Visual Studio 16 2019" -A %arch%) + - echo %generator% + +# scripts to run before build +before_build: + - mkdir build + - cd build + - 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_script: + - cmake --build . --config %configuration% + - ctest --output-on-failure diff --git a/googletest b/googletest index ec44c6c..703bd9c 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 +Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e