Skip to content

Commit

Permalink
Change to use GoogleTest for github repo with update
Browse files Browse the repository at this point in the history
The 1.8.0 release has issues with MSVC 2017. The usage of tr1 produces
a warning, and flags are enable so that warnings are enabled. The
selected version of GoogleTest is the same one that ITK is using has a
fix for the issue.

google/googletest#1111
  • Loading branch information
blowekamp committed Jan 9, 2018
1 parent 9fb3296 commit d781677
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions SuperBuild/External_GTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ set(${CMAKE_CURRENT_LIST_FILENAME}_FILE_INCLUDED 1)

set(proj GTest)

set(GTEST_TARGET_VERSION 1.8.0)
set(GTEST_DOWNLOAD_SOURCE_HASH "16877098823401d1bf2ed7891d7dce36")
set(GTEST_GIT_REPOSITORY "${git_protocol}://github.com/google/googletest.git" CACHE STRING "Google Test repository")
mark_as_advanced(GTEST_GIT_REPOSITORY)

set(GTEST_GIT_TAG "0fe96607d85cf3a25ac40da369db62bbee2939a5" CACHE STRING "Tag or hash for GTtest git repo")
mark_as_advanced(GTEST_GIT_TAG)
set(GTEST_TAG_COMMAND GIT_TAG "${GTEST_GIT_TAG}")

# follow the standard EP_PREFIX locations
set(GTEST_source_dir ${CMAKE_CURRENT_BINARY_DIR}/${proj}-prefix/src/${proj})

sitkSourceDownload(GTEST_URL "googletest-release-${GTEST_TARGET_VERSION}.tar.gz" ${GTEST_DOWNLOAD_SOURCE_HASH})

ExternalProject_Add(${proj}
URL "${GTEST_URL}"
URL_MD5 ${GTEST_DOWNLOAD_SOURCE_HASH}
GIT_REPOSITORY ${GTEST_GIT_REPOSITORY}
${GTEST_TAG_COMMAND}
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
Expand Down

0 comments on commit d781677

Please sign in to comment.