From 1470735e9485a3fd5793d00c18b5116b527c5ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Mon, 1 Aug 2016 22:27:31 +0200 Subject: [PATCH] Switch googletest submodule to latest commit of github.com/google/googletest.git --- .gitmodules | 2 +- CMakeLists.txt | 2 +- googletest | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8ab9880..8cf8b5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "googletest"] path = googletest - url = https://chromium.googlesource.com/external/googletest.git + url = https://github.com/google/googletest.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b29bb8c..a504416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,7 @@ if (SQLITECPP_BUILD_TESTS) message(FATAL_ERROR "Missing 'googletest' submodule! Either use 'git init submodule' and 'git update submodule' to get googletest according to the README, or deactivate unit tests with -DSQLITECPP_BUILD_TESTS=OFF") endif () add_subdirectory(googletest) - include_directories("${PROJECT_SOURCE_DIR}/googletest/include") + include_directories("${PROJECT_SOURCE_DIR}/googletest/googletest/include") # add the unit test executable add_executable(SQLiteCpp_tests ${SQLITECPP_TESTS}) diff --git a/googletest b/googletest index 23574bf..ec44c6c 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit 23574bf2333f834ff665f894c97bef8a5b33a0a9 +Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780