diff --git a/cmake/modules/FindOrFetchUmpire.cmake b/cmake/modules/FindOrFetchUmpire.cmake deleted file mode 100644 index 6e77dcbb48..0000000000 --- a/cmake/modules/FindOrFetchUmpire.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# try find_package -if (NOT TARGET umpire) - include (FindPackageRegimport) - find_package_regimport(umpire QUIET CONFIG) - if (TARGET umpire) - message(STATUS "Found umpire CONFIG at ${umpire_CONFIG}") - endif (TARGET umpire) -endif (NOT TARGET umpire) - -# if not found, build via FetchContent -if (NOT TARGET umpire) - - # caveat: on recent Ubuntu default libstdc++ provides filesystem, but if using older gcc (gcc-8) must link against - # libstdc++fs: https://bugs.launchpad.net/ubuntu/+source/gcc-8/+bug/1824721 ... skip the use of std::filesystem altogether with pre-9 gcc!!! - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9) - # disable by populating cache with compile test result variable - set(UMPIRE_ENABLE_FILESYSTEM OFF CACHE BOOL "Whether Umpire to use std::filesystem") - endif() - - include(FetchContent) - FetchContent_Declare( - umpire - GIT_REPOSITORY https://github.com/LLNL/Umpire.git - GIT_TAG ${TA_TRACKED_UMPIRE_TAG} - ) - FetchContent_MakeAvailable(umpire) - FetchContent_GetProperties(umpire - SOURCE_DIR UMPIRE_SOURCE_DIR - BINARY_DIR UMPIRE_BINARY_DIR - ) - - # set BTAS_CONFIG to the install location so that we know where to find it - set(umpire_CONFIG ${CMAKE_INSTALL_PREFIX}/${UMPIRE_CMAKE_DIR}/umpire-config.cmake) - - # install umpire - install(TARGETS umpire umpire_alloc EXPORT tiledarray COMPONENT tiledarray ) - -endif(NOT TARGET umpire) - -# postcond check -if (NOT TARGET umpire) - message(FATAL_ERROR "FindOrFetchUmpire could not make umpire target available") -endif(NOT TARGET umpire) diff --git a/external/librett.cmake b/external/librett.cmake index 456bd99068..496c9ddd97 100644 --- a/external/librett.cmake +++ b/external/librett.cmake @@ -24,7 +24,6 @@ else() # set source and build path for LibreTT in the TiledArray project set(EXTERNAL_SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/librett-src) - # librett only supports in source build set(EXTERNAL_BUILD_DIR ${FETCHCONTENT_BASE_DIR}/librett-build) set(EXTERNAL_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) @@ -176,7 +175,9 @@ set_target_properties(TiledArray_LIBRETT INTERFACE_INCLUDE_DIRECTORIES "$;$" INTERFACE_LINK_LIBRARIES - "$;$" + "$;$" + INTERFACE_LINK_OPTIONS + "LINKER:-rpath,${EXTERNAL_BUILD_DIR}/src" ) if (TA_CUDA) set_target_properties(TiledArray_LIBRETT diff --git a/external/versions.cmake b/external/versions.cmake index aa0ff63a4b..aa0894f9cd 100644 --- a/external/versions.cmake +++ b/external/versions.cmake @@ -23,8 +23,8 @@ set(TA_TRACKED_BTAS_PREVIOUS_TAG 1cfcb12647c768ccd83b098c64cda723e1275e49) set(TA_TRACKED_LIBRETT_TAG 6eed30d4dd2a5aa58840fe895dcffd80be7fbece) set(TA_TRACKED_LIBRETT_PREVIOUS_TAG 354e0ccee54aeb2f191c3ce2c617ebf437e49d83) -set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG a48ad360e20b9733263768b54aa24afe5894faa4) -set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG 583ec579917103cbfee3ba5b67bab1582711b06e) +set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG cbb08408b1cfbbacc24992e36f52edb3a29bdedc) +set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG a48ad360e20b9733263768b54aa24afe5894faa4) set(TA_TRACKED_SCALAPACKPP_TAG 6397f52cf11c0dfd82a79698ee198a2fce515d81) set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 711ef363479a90c88788036f9c6c8adb70736cbf )