diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-24 19:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 19:00:57 -0400 |
| commit | 8ec8ce1c8a51076950bfa7a7886d95f4c8aed11b (patch) | |
| tree | b7f5433fce3803d121c9963dc69bcdeec4d35f7c | |
| parent | 6463ee81ae7ea8ee3dcaf341cb727d278f8cfe6b (diff) | |
| parent | c45631823c983935d228557b124eff05263b2660 (diff) | |
| download | googletest-8ec8ce1c8a51076950bfa7a7886d95f4c8aed11b.tar.gz googletest-8ec8ce1c8a51076950bfa7a7886d95f4c8aed11b.tar.bz2 googletest-8ec8ce1c8a51076950bfa7a7886d95f4c8aed11b.zip | |
Merge pull request #1934 from jeffvandyke/patch-2
Change CMake googletest download location in docs
| -rw-r--r-- | googletest/README.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/googletest/README.md b/googletest/README.md index 133f6859..626fd7b0 100644 --- a/googletest/README.md +++ b/googletest/README.md @@ -124,8 +124,8 @@ include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG master - SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" - BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" @@ -140,13 +140,13 @@ Existing build's `CMakeLists.txt`: configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ) if(result) message(FATAL_ERROR "CMake step for googletest failed: ${result}") endif() execute_process(COMMAND ${CMAKE_COMMAND} --build . RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ) if(result) message(FATAL_ERROR "Build step for googletest failed: ${result}") endif() @@ -157,8 +157,8 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. -add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src - ${CMAKE_BINARY_DIR}/googletest-build +add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src + ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL) # The gtest/gtest_main targets carry header search path |