Skip to content

Commit

Permalink
Merge pull request htm-community#916 from htm-community/gtest_update
Browse files Browse the repository at this point in the history
Gtest update to  version10.0
  • Loading branch information
breznak authored Feb 20, 2021
2 parents cef5af8 + de08720 commit f6fdfaa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions external/gtest.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -----------------------------------------------------------------------------
# HTM Community Edition of NuPIC
# Copyright (C) 2015, Numenta, Inc.
# Copyright (C) 2021, Numenta, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero Public License version 3 as
Expand Down Expand Up @@ -34,7 +34,7 @@
if(EXISTS "${REPOSITORY_DIR}/build/ThirdParty/share/googletest.tar.gz")
set(URL "${REPOSITORY_DIR}/build/ThirdParty/share/googletest.tar.gz")
else()
set(URL https://github.com/abseil/googletest/archive/release-1.8.1.tar.gz)
set(URL https://github.com/abseil/googletest/archive/release-1.10.0.tar.gz)
endif()

#
Expand All @@ -54,12 +54,12 @@ set(BUILD_GMOCK OFF CACHE BOOL "prevents building gmock" FORCE)
add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})

if(MSVC)
set(gtest_LIBRARIES ${googletest_BINARY_DIR}/googletest/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>/${CMAKE_STATIC_LIBRARY_PREFIX}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX})
set(gtest_LIBRARIES ${REPOSITORY_DIR}/build/ThirdParty/lib/$<$<CONFIG:Release>:Release>$<$<CONFIG:Debug>:Debug>/${CMAKE_STATIC_LIBRARY_PREFIX}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX})
else()
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(DEBUG_POSTFIX d)
endif()
set(gtest_LIBRARIES ${googletest_BINARY_DIR}/googletest/${CMAKE_STATIC_LIBRARY_PREFIX}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX})
set(gtest_LIBRARIES ${REPOSITORY_DIR}/build/ThirdParty/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()
FILE(APPEND "${EXPORT_FILE_NAME}" "gtest_INCLUDE_DIRS@@@${googletest_SOURCE_DIR}/googletest/include\n")
FILE(APPEND "${EXPORT_FILE_NAME}" "gtest_LIBRARIES@@@${gtest_LIBRARIES}\n")
Expand Down

0 comments on commit f6fdfaa

Please sign in to comment.