Skip to content

GitLab

Commit 2efd659a authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

Merge pull request #2163 from ngie-eign:cmake-fix-gtest-binary-prefixing-when-gmock-enabled 

PiperOrigin-RevId: 241376090
parents d9825431 9b6de41b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
googlemock/CMakeLists.txt
View file @ 2efd659a
...@@ -49,7 +49,7 @@ endif() ...@@ -49,7 +49,7 @@ endif()
# targets to the current scope. We are placing Google Test's binary # targets to the current scope. We are placing Google Test's binary
# directory in a subdirectory of our own as VC compilation may break # directory in a subdirectory of our own as VC compilation may break
# if they are the same (the default). # 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 # These commands only run if this is the main project
......
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