Merge pull request #568 from lacombar/googlemock-build-dir

googlemock: change guess of googletest's relative location from ../gtest to ../googletest
This commit is contained in:
Billy Donahue 2015-08-27 10:24:19 -04:00
commit 64d23926f9

View File

@ -15,7 +15,7 @@ option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
set(gtest_dir gtest) set(gtest_dir gtest)
else() else()
set(gtest_dir ../gtest) set(gtest_dir ../googletest)
endif() endif()
# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().