From b3b25af5f541f579c149dabbf5cd5646a8847cb2 Mon Sep 17 00:00:00 2001
From: Andrew Wildman <apw4@uw.edu>
Date: Thu, 14 Oct 2021 11:28:18 -0700
Subject: [PATCH] Change ExternalProject prefixes to always match the
 FetchContent location

---
 external/cutt.cmake   | 8 ++++----
 external/eigen.cmake  | 4 ++--
 external/umpire.cmake | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/external/cutt.cmake b/external/cutt.cmake
index f945b54b15..e06d32bb5e 100644
--- a/external/cutt.cmake
+++ b/external/cutt.cmake
@@ -23,9 +23,9 @@ else()
     enable_language(C)
 
     # set source and build path for cuTT in the TiledArray project
-    set(EXTERNAL_SOURCE_DIR   ${CMAKE_BINARY_DIR}/_deps/cutt-src)
+    set(EXTERNAL_SOURCE_DIR   ${FETCHCONTENT_BASE_DIR}/cutt-src)
     # cutt only supports in source build
-    set(EXTERNAL_BUILD_DIR  ${CMAKE_BINARY_DIR}/_deps/cutt-build)
+    set(EXTERNAL_BUILD_DIR  ${FETCHCONTENT_BASE_DIR}/cutt-build)
     set(EXTERNAL_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
 
     if (NOT CUTT_URL)
@@ -92,8 +92,8 @@ else()
 
     ExternalProject_Add(cutt
             PREFIX ${CMAKE_INSTALL_PREFIX}
-            STAMP_DIR ${CMAKE_BINARY_DIR}/_deps/cutt-ep-artifacts
-            TMP_DIR ${CMAKE_BINARY_DIR}/_deps/cutt-ep-artifacts  # needed in case CMAKE_INSTALL_PREFIX is not writable
+            STAMP_DIR ${FETCHCONTENT_BASE_DIR}/cutt-ep-artifacts
+            TMP_DIR ${FETCHCONTENT_BASE_DIR}/cutt-ep-artifacts  # needed in case CMAKE_INSTALL_PREFIX is not writable
             #--Download step--------------
             DOWNLOAD_DIR ${EXTERNAL_SOURCE_DIR}
             GIT_REPOSITORY ${CUTT_URL}
diff --git a/external/eigen.cmake b/external/eigen.cmake
index 361a8fe8ae..438d256daf 100644
--- a/external/eigen.cmake
+++ b/external/eigen.cmake
@@ -93,8 +93,8 @@ else()
   include(ExternalProject)
 
   # Set source and build path for Eigen3 in the TiledArray Project
-  set(EXTERNAL_SOURCE_DIR   ${CMAKE_BINARY_DIR}/_deps/eigen-src)
-  set(EXTERNAL_BUILD_DIR  ${CMAKE_BINARY_DIR}/_deps/eigen-build)
+  set(EXTERNAL_SOURCE_DIR   ${FETCHCONTENT_BASE_DIR}/eigen-src)
+  set(EXTERNAL_BUILD_DIR  ${FETCHCONTENT_BASE_DIR}/eigen-build)
 
   message("** Will build Eigen from ${EIGEN3_URL}")
 
diff --git a/external/umpire.cmake b/external/umpire.cmake
index bed350f0c9..2737864d39 100644
--- a/external/umpire.cmake
+++ b/external/umpire.cmake
@@ -29,8 +29,8 @@ else()
     enable_language(C)
 
     # set source and build path for Umpire in the TiledArray project
-    set(EXTERNAL_SOURCE_DIR ${CMAKE_BINARY_DIR}/_deps/umpire-src)
-    set(EXTERNAL_BUILD_DIR ${CMAKE_BINARY_DIR}/_deps/umpire-build)
+    set(EXTERNAL_SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/umpire-src)
+    set(EXTERNAL_BUILD_DIR ${FETCHCONTENT_BASE_DIR}/umpire-build)
     set(EXTERNAL_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
 
     if (NOT UMPIRE_URL)
@@ -116,8 +116,8 @@ else()
 
     ExternalProject_Add(Umpire
             PREFIX ${CMAKE_INSTALL_PREFIX}
-            STAMP_DIR ${CMAKE_BINARY_DIR}/_deps/umpire-ep-artifacts
-            TMP_DIR ${CMAKE_BINARY_DIR}/_deps/umpire-ep-artifacts   # needed in case CMAKE_INSTALL_PREFIX is not writable
+            STAMP_DIR ${FETCHCONTENT_BASE_DIR}/umpire-ep-artifacts
+            TMP_DIR ${FETCHCONTENT_BASE_DIR}/umpire-ep-artifacts   # needed in case CMAKE_INSTALL_PREFIX is not writable
             #--Download step--------------
             DOWNLOAD_DIR ${EXTERNAL_SOURCE_DIR}
             GIT_REPOSITORY ${UMPIRE_URL}