diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-04-01 19:27:49 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-04-01 19:27:49 (GMT) |
| commit | 2efd659a13e9127d65266c368c06466e2842b2e6 (patch) | |
| tree | beeb820aa2fcd2c358e4d8674bcb2b8c60a49f25 | |
| parent | d9825431313a8ce466489cfc19f93820aee319ee (diff) | |
| parent | 9b6de41b5d9d7b78c4dfdc5e64df4323f677c69c (diff) | |
| download | googletest-2efd659a13e9127d65266c368c06466e2842b2e6.zip googletest-2efd659a13e9127d65266c368c06466e2842b2e6.tar.gz googletest-2efd659a13e9127d65266c368c06466e2842b2e6.tar.bz2 | |
Merge pull request #2163 from ngie-eign:cmake-fix-gtest-binary-prefixing-when-gmock-enabled
PiperOrigin-RevId: 241376090
| -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 b0c1db8..eff2a6b 100644 --- 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 |