Skip to content

R
rapidjson
Commit ba54d028 authored by Milo Yip's avatar Milo Yip Committed by GitHub
Browse files
Options

Merge pull request #656 from miloyip/pr/651 

Fix cmake build with new gtest reference
parents e6895ec1 ce3ca58f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.gitmodules
View file @ ba54d028
[submodule "thirdparty/gtest"] [submodule "thirdparty/gtest"]
path = thirdparty/gtest path = thirdparty/gtest
url = https://chromium.googlesource.com/external/googletest.git url = https://github.com/google/googletest.git
CMakeModules/FindGTestSrc.cmake
View file @ ba54d028
SET(GTEST_SEARCH_PATH SET(GTEST_SEARCH_PATH
"${GTEST_SOURCE_DIR}" "${GTEST_SOURCE_DIR}"
"${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest") "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest")
IF(UNIX) IF(UNIX)
IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST) IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST)
......
gtest @ 0a439623
Subproject commit 0476e154db5fab1721c2a0f32abf4aa773679b52 Subproject commit 0a439623f75c029912728d80cb7f1b8b48739ca4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment