Skip to content

Updated Google Test dependency from 1.7 to 1.10 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2020
Merged

Updated Google Test dependency from 1.7 to 1.10 #68

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c335e1a
copied googletest.cmake file from latest Firestore version
DellaBitta Jun 23, 2020
f67bf1e
Merge branch 'dev' into Feature/update_googletest_dependency
DellaBitta Jun 23, 2020
5ebc1a6
Updated copyright notice for 2020
DellaBitta Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions cmake/external/googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019 Google
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -18,19 +18,15 @@ if(TARGET googletest OR NOT DOWNLOAD_GOOGLETEST)
return()
endif()

# Googletest 1.8.0 fails to build on VS 2017:
# https://github.com/google/googletest/issues/1111.
#
# No release has been made since, so just pick a commit since then.
set(commit ba96d0b1161f540656efdaed035b3c062b60e006) # master@{2018-07-10}
set(version 1.10.0)

ExternalProject_Add(
googletest

DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
DOWNLOAD_NAME googletest-${commit}.tar.gz
URL https://github.com/google/googletest/archive/${commit}.tar.gz
URL_HASH SHA256=949c556896cf31ed52e53449e17a1276b8b26d3ee5932f5ca49ee929f4b35c51
DOWNLOAD_NAME googletest-${version}.tar.gz
URL https://github.com/google/googletest/archive/release-${version}.tar.gz
URL_HASH SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb

PREFIX ${PROJECT_BINARY_DIR}

Expand Down