From 1ce2c33dcaa37cd688205aab9679515d0b3e3f6f Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Tue, 2 Apr 2024 17:36:17 -0400 Subject: [PATCH 1/2] fetching eigen3 via ExternalProject_Add's needs to specify STAMP_DIR and TMP_DIR just like librett and umpire --- external/eigen.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/eigen.cmake b/external/eigen.cmake index f2d28076dd..1489b53fe6 100644 --- a/external/eigen.cmake +++ b/external/eigen.cmake @@ -104,7 +104,9 @@ else() ExternalProject_Add(eigen3 PREFIX ${CMAKE_INSTALL_PREFIX} - #--Download step-------------- + STAMP_DIR ${FETCHCONTENT_BASE_DIR}/eigen3-ep-artifacts + TMP_DIR ${FETCHCONTENT_BASE_DIR}/eigen3-ep-artifacts # needed in case CMAKE_INSTALL_PREFIX is not writable + #--Download step-------------- DOWNLOAD_DIR ${EXTERNAL_SOURCE_DIR} URL ${EIGEN3_URL} URL_HASH ${EIGEN3_URL_HASH} From 5e22878f2775f711286fcb03b4ddfaf46f089100 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Wed, 3 Apr 2024 08:30:25 -0400 Subject: [PATCH 2/2] to avoid premature creation of install directory ExternalProject_add will use FETCHCONTENT_BASE_DIR as PREFIX --- external/eigen.cmake | 2 +- external/librett.cmake | 2 +- external/umpire.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/eigen.cmake b/external/eigen.cmake index 1489b53fe6..57bbead90d 100644 --- a/external/eigen.cmake +++ b/external/eigen.cmake @@ -103,7 +103,7 @@ else() message("** Will build Eigen from ${EIGEN3_URL}") ExternalProject_Add(eigen3 - PREFIX ${CMAKE_INSTALL_PREFIX} + PREFIX ${FETCHCONTENT_BASE_DIR} STAMP_DIR ${FETCHCONTENT_BASE_DIR}/eigen3-ep-artifacts TMP_DIR ${FETCHCONTENT_BASE_DIR}/eigen3-ep-artifacts # needed in case CMAKE_INSTALL_PREFIX is not writable #--Download step-------------- diff --git a/external/librett.cmake b/external/librett.cmake index c04cf56b38..afebabb486 100644 --- a/external/librett.cmake +++ b/external/librett.cmake @@ -109,7 +109,7 @@ else() message(STATUS "custom target librett is expected to build these byproducts: ${LIBRETT_BUILD_BYPRODUCTS}") ExternalProject_Add(librett - PREFIX ${CMAKE_INSTALL_PREFIX} + PREFIX ${FETCHCONTENT_BASE_DIR} STAMP_DIR ${FETCHCONTENT_BASE_DIR}/librett-ep-artifacts TMP_DIR ${FETCHCONTENT_BASE_DIR}/librett-ep-artifacts # needed in case CMAKE_INSTALL_PREFIX is not writable #--Download step-------------- diff --git a/external/umpire.cmake b/external/umpire.cmake index c7a02d65bf..57675ca189 100644 --- a/external/umpire.cmake +++ b/external/umpire.cmake @@ -163,7 +163,7 @@ else() message(STATUS "custom target Umpire is expected to build these byproducts: ${UMPIRE_BUILD_BYPRODUCTS}") ExternalProject_Add(Umpire - PREFIX ${CMAKE_INSTALL_PREFIX} + PREFIX ${FETCHCONTENT_BASE_DIR} 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--------------