mirror of https://github.com/ARMmbed/mbed-os.git
update googletest to v1.8.1
parent
f5dd7db8c7
commit
72be5848ce
|
@ -52,8 +52,8 @@ add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
|
||||||
# dependencies automatically when using CMake 2.8.11 or
|
# dependencies automatically when using CMake 2.8.11 or
|
||||||
# later.
|
# later.
|
||||||
target_include_directories(gmock_main SYSTEM BEFORE INTERFACE
|
target_include_directories(gmock_main SYSTEM BEFORE INTERFACE
|
||||||
"${gtest_SOURCE_DIR}/include"
|
"$<BUILD_INTERFACE:${gtest_SOURCE_DIR}/include>"
|
||||||
"${gmock_SOURCE_DIR}/include")
|
"$<BUILD_INTERFACE:${gmock_SOURCE_DIR}/include>")
|
||||||
|
|
||||||
####################
|
####################
|
||||||
# TESTING
|
# TESTING
|
||||||
|
|
|
@ -5,7 +5,7 @@ project(googletest-download NONE)
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
ExternalProject_Add(googletest
|
ExternalProject_Add(googletest
|
||||||
GIT_REPOSITORY https://github.com/google/googletest.git
|
GIT_REPOSITORY https://github.com/google/googletest.git
|
||||||
GIT_TAG 8bc11c040a1dcbe50c340b21d78175d152dd3837
|
GIT_TAG release-1.8.1
|
||||||
SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
|
SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
|
||||||
BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
|
BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
|
||||||
CONFIGURE_COMMAND ""
|
CONFIGURE_COMMAND ""
|
||||||
|
|
Loading…
Reference in New Issue