Prefix googletest binaries under its own subtree instead of `gtest`

Building all test binaries under their respective subtrees makes building the project via cmake easier to grok without additional hacks. In particular, when dealing with the conversion I proposed in https://reviews.freebsd.org/D19430 (switching from autotools to cmake), I ran into unexpected gtest prefixing under the googlemock directory, as opposed to the googletest directory. Example: Before: `googlemock/gtest/googletest-break-on-failure-unittest_` After: `googletest/googletest-break-on-failure-unittest_` The latter form is easier to translate to packaging manifests when building googlemock is disabled, as well as enabled, as the path remains consistent when the feature flag is disabled. Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>

Prefix googletest binaries under its own subtree instead of `gtest`
9b6de41b · Enji Cooper · 5b752b19 · 9b6de41b
Commit 9b6de41b authored Mar 04, 2019 by Enji Cooper
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CMakeLists.txt googlemock/CMakeLists.txt +1 -1

No files found.
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -49,7 +49,7 @@ endif()
 # targets to the current scope.  We are placing Google Test's binary
 # directory in a subdirectory of our own as VC compilation may break
 # if they are the same (the default).
-add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/gtest")
+add_subdirectory("${gtest_dir}" "${gmock_BINARY_DIR}/${gtest_dir}")


 # These commands only run if this is the main project