diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2020-02-26 15:41:46 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2020-02-26 16:17:44 -0500 |
| commit | 2e872ef50e2127b94bc0f2f29f4e36fad3463dc0 (patch) | |
| tree | d34631b72fa1df9736446ac18d705f897c756b83 | |
| parent | 898fb3a7043bd5af6a42c18b21109f12138c977c (diff) | |
Now that testing against a local googletest is supported,
`googletest-download` is a bit of a misnomer. Change references to
`googletest-download` to `googletest-external`.
| -rw-r--r-- | CMake/Googletest/CMakeLists.txt.in | 2 | ||||
| -rw-r--r-- | CMake/Googletest/DownloadGTest.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMake/Googletest/CMakeLists.txt.in b/CMake/Googletest/CMakeLists.txt.in index 0c64218..994dac0 100644 --- a/CMake/Googletest/CMakeLists.txt.in +++ b/CMake/Googletest/CMakeLists.txt.in @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.2) -project(googletest-download NONE) +project(googletest-external NONE) include(ExternalProject) if(${ABSL_USE_GOOGLETEST_HEAD}) diff --git a/CMake/Googletest/DownloadGTest.cmake b/CMake/Googletest/DownloadGTest.cmake index 9b4f62b..9d071c9 100644 --- a/CMake/Googletest/DownloadGTest.cmake +++ b/CMake/Googletest/DownloadGTest.cmake @@ -5,7 +5,7 @@ # master if requested. configure_file( ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in - ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt + ${CMAKE_BINARY_DIR}/googletest-external/CMakeLists.txt ) set(ABSL_SAVE_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) @@ -18,14 +18,14 @@ endif() # Configure and build the googletest source. execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-external ) 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_BINARY_DIR}/googletest-external) if(result) message(FATAL_ERROR "Build step for googletest failed: ${result}") endif() |