Skip to content

G
googletest
Commit 64d23926 by Billy Donahue
Options

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

googlemock: change guess of googletest's relative location from ../gtest to ../googletest
parents fba82582 eff38a7a
Showing with 1 addition and 1 deletion
googlemock/CMakeLists.txt
...@@ -15,7 +15,7 @@ option(gmock_build_tests "Build all of Google Mock's own tests." OFF) ...@@ -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().
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment