diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6c723dd..72c4c12 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,7 +7,7 @@ ADD_EXECUTABLE(demo demo.cpp) ADD_EXECUTABLE(thread_pool_demo thread_pool_demo.cpp) TARGET_LINK_LIBRARIES(thread_pool_demo pthread) -SET(GTEST_ROOT_DIR googletest) +SET(GTEST_ROOT_DIR googletest/googletest) INCLUDE_DIRECTORIES(${GTEST_ROOT_DIR} ${GTEST_ROOT_DIR}/include) ADD_DEFINITIONS(-DGTEST_USE_OWN_TR1_TUPLE=1) ADD_LIBRARY(gtest STATIC ${GTEST_ROOT_DIR}/src/gtest-all.cc) diff --git a/test/googletest b/test/googletest index 800f542..703bd9c 160000 --- a/test/googletest +++ b/test/googletest @@ -1 +1 @@ -Subproject commit 800f5422ac9d9e0ad59cd860a2ef3a679588acb4 +Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e