Skip to content

Commit 42e0d65

Browse files
authored
Merge pull request #530 from ValeevGroup/evaleev/fix/rpath-issues
fix `RPATH` issues
2 parents 831295a + 9abb6ef commit 42e0d65

File tree

3 files changed

+5
-47
lines changed

3 files changed

+5
-47
lines changed

cmake/modules/FindOrFetchUmpire.cmake

Lines changed: 0 additions & 43 deletions
This file was deleted.

external/librett.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ else()
2424

2525
# set source and build path for LibreTT in the TiledArray project
2626
set(EXTERNAL_SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/librett-src)
27-
# librett only supports in source build
2827
set(EXTERNAL_BUILD_DIR ${FETCHCONTENT_BASE_DIR}/librett-build)
2928
set(EXTERNAL_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
3029

@@ -176,7 +175,9 @@ set_target_properties(TiledArray_LIBRETT
176175
INTERFACE_INCLUDE_DIRECTORIES
177176
"$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src>;$<INSTALL_INTERFACE:${_LIBRETT_INSTALL_DIR}/include>"
178177
INTERFACE_LINK_LIBRARIES
179-
"$<BUILD_INTERFACE:${LIBRETT_BUILD_BYPRODUCTS}>;$<INSTALL_INTERFACE:${_LIBRETT_INSTALL_DIR}/lib/librett.${LIBRETT_DEFAULT_LIBRARY_SUFFIX}>"
178+
"$<BUILD_INTERFACE:${LIBRETT_BUILD_BYPRODUCTS}>;$<INSTALL_INTERFACE:${_LIBRETT_INSTALL_DIR}/lib/librett${LIBRETT_DEFAULT_LIBRARY_SUFFIX}>"
179+
INTERFACE_LINK_OPTIONS
180+
"LINKER:-rpath,${EXTERNAL_BUILD_DIR}/src"
180181
)
181182
if (TA_CUDA)
182183
set_target_properties(TiledArray_LIBRETT

external/versions.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ set(TA_TRACKED_BTAS_PREVIOUS_TAG 1cfcb12647c768ccd83b098c64cda723e1275e49)
2323
set(TA_TRACKED_LIBRETT_TAG 6eed30d4dd2a5aa58840fe895dcffd80be7fbece)
2424
set(TA_TRACKED_LIBRETT_PREVIOUS_TAG 354e0ccee54aeb2f191c3ce2c617ebf437e49d83)
2525

26-
set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG a48ad360e20b9733263768b54aa24afe5894faa4)
27-
set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG 583ec579917103cbfee3ba5b67bab1582711b06e)
26+
set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_TAG cbb08408b1cfbbacc24992e36f52edb3a29bdedc)
27+
set(TA_TRACKED_UMPIRE-CXX-ALLOCATOR_PREVIOUS_TAG a48ad360e20b9733263768b54aa24afe5894faa4)
2828

2929
set(TA_TRACKED_SCALAPACKPP_TAG 6397f52cf11c0dfd82a79698ee198a2fce515d81)
3030
set(TA_TRACKED_SCALAPACKPP_PREVIOUS_TAG 711ef363479a90c88788036f9c6c8adb70736cbf )

0 commit comments

Comments
 (0)