aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/README.md
diff options
context:
space:
mode:
authorJeff VanDyke <jeffvd.a216@gmail.com>2018-10-24 16:41:14 -0400
committerGitHub <noreply@github.com>2018-10-24 16:41:14 -0400
commitc45631823c983935d228557b124eff05263b2660 (patch)
treeb7f5433fce3803d121c9963dc69bcdeec4d35f7c /googletest/README.md
parent6463ee81ae7ea8ee3dcaf341cb727d278f8cfe6b (diff)
downloadgoogletest-c45631823c983935d228557b124eff05263b2660.tar.gz
googletest-c45631823c983935d228557b124eff05263b2660.tar.bz2
googletest-c45631823c983935d228557b124eff05263b2660.zip
Change CMake googletest download location in docs
Change CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR Able to use in a subfolder's CMakeLists.txt
Diffstat (limited to 'googletest/README.md')
-rw-r--r--googletest/README.md12
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