Skip to content

Update gtest version #626

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

Open
dstoup wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update gtest version #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f01a88
Update GTest to the latest version, 1.10.0
dstoup Oct 27, 2020
21b90aa
Update release-notes
dstoup Oct 27, 2020
faa57d7
Remove 1.8.1 patches
dstoup Oct 27, 2020
099ccd0
Merge branch 'master' into update-gtest-version
dstoup Oct 28, 2020
3a7c355
Remove GTest patches. One is merged upstream, the other might not be …
dstoup Oct 28, 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
4 changes: 0 additions & 4 deletions CMake/External_GTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ ExternalProject_Add(GTest
DOWNLOAD_NAME ${GTest_dlname}
${COMMON_EP_ARGS}
${COMMON_CMAKE_EP_ARGS}
PATCH_COMMAND ${CMAKE_COMMAND}
-DGTest_patch:PATH=${fletch_SOURCE_DIR}/Patches/GTest
-DGTest_source:PATH=${fletch_BUILD_PREFIX}/src/GTest
-P ${fletch_SOURCE_DIR}/Patches/GTest/Patch.cmake
CMAKE_ARGS
${COMMON_CMAKE_ARGS}
${Gtest_CXX_STANDARD_ARGS}
Expand Down
4 changes: 2 additions & 2 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ set(GLog_md5 "5df6d78b81e51b90ac0ecd7ed932b0d4")
set(GLog_dlname "glog-${GLog_version}.tar.gz")
list(APPEND fletch_external_sources GLog)

set(GTest_version "1.8.1")
set(GTest_version "1.10.0")
set(GTest_url "https://github.com/google/googletest/archive/release-${GTest_version}.tar.gz")
set(GTest_md5 "2e6fbeb6a91310a16efe181886c59596")
set(GTest_md5 "ecd1fa65e7de707cd5c00bdac56022cd")
set(GTest_dlname "gtest-${GTest_version}.tar.gz")
list(APPEND fletch_external_sources GTest)

Expand Down
1 change: 1 addition & 0 deletions Doc/release-notes/master.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Updates since v1.4.0
* Update libtiff from 4.0.6 to 4.1.0
* Update ZLib from 1.2.9 to 1.2.11
* Update Eigen from 3.3.4 to 3.3.7
* Update GTest from 1.8.1 to 1.10.0
* Remove support for OpenCV 2
* Add VTK version 9.0.1

Expand Down
14 changes: 0 additions & 14 deletions Patches/GTest/Patch.cmake
View file
Open in desktop

This file was deleted.

204 changes: 0 additions & 204 deletions Patches/GTest/googlemock/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading