Skip to content

Commit f26ea40

Browse files
committed
Merge branch 'master' into kmp5/feature/thc+LT_to_THC
2 parents a244a94 + 4765318 commit f26ea40

File tree

4 files changed

+50
-47
lines changed

4 files changed

+50
-47
lines changed

.gitignore

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Linker files
15+
*.ilk
16+
17+
# Debugger Files
18+
*.pdb
19+
20+
# Compiled Dynamic libraries
21+
*.so
22+
*.dylib
23+
*.dll
24+
25+
# Fortran module files
26+
*.mod
27+
*.smod
28+
29+
# Compiled Static libraries
30+
*.lai
31+
*.la
32+
*.a
33+
*.lib
34+
35+
# Executables
36+
*.exe
37+
*.out
38+
*.app
39+
40+
# debug information files
41+
*.dwo
42+
43+
# IDEs
44+
*.idea
45+
*.vscode

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 26646416e5f5829dc13d0d97fb15ae5c01b78e82)
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)