From 54fdb90a204a39342bfcbab197e3b5da47a9f1cd Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Sat, 28 Mar 2020 12:44:30 +1300 Subject: CMake: prefer to use use PROJ_SOURCE_DIR and PROJ_BINARY_DIR (#2100) * Use instead of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR * Also PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR, which are similar * Set properties with a list variable rather than a long line * Correction to 'proj_test_set_properties' function, rename ENVIRONMENT: - PROJ_IGNORE_USER_WRITABLE_DIRECTORY (ignored) - PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY (used by filemanager.cpp) --- test/googletest/CMakeLists.txt.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/googletest') diff --git a/test/googletest/CMakeLists.txt.in b/test/googletest/CMakeLists.txt.in index dbe3effe..b558e203 100644 --- a/test/googletest/CMakeLists.txt.in +++ b/test/googletest/CMakeLists.txt.in @@ -8,11 +8,11 @@ ExternalProject_Add(googletest URL https://github.com/google/googletest/archive/release-1.8.1.zip URL_HASH SHA1=7b41ea3682937069e3ce32cb06619fead505795e DOWNLOAD_NO_PROGRESS ON - SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" - BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + SOURCE_DIR "${PROJ_BINARY_DIR}/googletest-src" + BINARY_DIR "${PROJ_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" BUILD_COMMAND "" TEST_COMMAND "" # Disable install step INSTALL_COMMAND "" -) \ No newline at end of file +) -- cgit v1.2.3