Merge pull request #656 from miloyip/pr/651

Fix cmake build with new gtest reference
Tencent · Jun 10, 2016 · ba54d02 · ba54d02
2 parents e6895ec + ce3ca58
commit ba54d02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "thirdparty/gtest"]
 	path = thirdparty/gtest
-	url = https://chromium.googlesource.com/external/googletest.git
+	url = https://github.com/google/googletest.git
diff --git a/CMakeModules/FindGTestSrc.cmake b/CMakeModules/FindGTestSrc.cmake
@@ -1,7 +1,7 @@
 
 SET(GTEST_SEARCH_PATH
     "${GTEST_SOURCE_DIR}"
-    "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest")
+    "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest")
 
 IF(UNIX)
     IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST)

diff --git a/thirdparty/gtest b/thirdparty/gtest