diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-08-27 10:24:19 -0400 |
|---|---|---|
| committer | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2015-08-27 10:24:19 -0400 |
| commit | 64d23926f9e492b59ffac8198604ca9c3768b845 (patch) | |
| tree | c661f20b2ab5828fd048dd6495b75eea07b1606b | |
| parent | fba825826ab8a67fc61fa4ccc2245ada780cb43b (diff) | |
| parent | eff38a7a0f153b5f9bfb1bd147027b04978e6c19 (diff) | |
| download | googletest-64d23926f9e492b59ffac8198604ca9c3768b845.tar.gz googletest-64d23926f9e492b59ffac8198604ca9c3768b845.tar.bz2 googletest-64d23926f9e492b59ffac8198604ca9c3768b845.zip | |
Merge pull request #568 from lacombar/googlemock-build-dir
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 4cc66372..cd522776 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -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") set(gtest_dir gtest) else() - set(gtest_dir ../gtest) + set(gtest_dir ../googletest) endif() # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). |