gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #656 from miloyip/pr/651

Browse Source 
Fix cmake build with new gtest reference
This commit is contained in:
Milo Yip 2016-06-09 21:26:37 -05:00 committed by GitHub
commit ba54d02871
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[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

2
CMakeModules/FindGTestSrc.cmake
View File

@ -1,7 +1,7 @@
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)

2
thirdparty/gtest vendored

@ -1 +1 @@
Subproject commit 0476e154db5fab1721c2a0f32abf4aa773679b52 Subproject commit 0a439623f75c029912728d80cb7f1b8b48739ca4