Skip to content

Commit 985ed8a

Browse files
committed
[cmake] for cmake v3.28 set policy CMP0146 to OLD to satisfy BLT that still uses FindCUDA + use CUDA_TOOLKIT_ROOT_DIR to assist FindCUDA in finding CUDA toolkit
resolves #438
1 parent 81bafdc commit 985ed8a

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ variables:
1515
TA_UT_CTEST_TIMEOUT=3000
1616
${TA_PYTHON}
1717
${ENABLE_CUDA}
18+
CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda
1819
${BLA_VENDOR}
1920
${BLA_THREADS}
2021
${ENABLE_SCALAPACK}

external/umpire.cmake

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,15 @@ else()
109109
if (DEFINED CMAKE_CUDA_ARCHITECTURES)
110110
list(APPEND UMPIRE_CMAKE_ARGS "-DCMAKE_CUDA_ARCHITECTURES=${CMAKE_CUDA_ARCHITECTURES}")
111111
endif(DEFINED CMAKE_CUDA_ARCHITECTURES)
112+
# BLT will need FindCUDA until https://github.com/LLNL/blt/pull/585 is merged
113+
# with CMake 3.28.1 needs to set CMP0146 to OLD
114+
if (POLICY CMP0146)
115+
list(APPEND UMPIRE_CMAKE_ARGS -DCMAKE_POLICY_DEFAULT_CMP0146=OLD)
116+
endif()
117+
# as of CMake 3.28+ FindCUDA seems to require CUDA_TOOLKIT_ROOT_DIR to be defined
118+
if (DEFINED CUDA_TOOLKIT_ROOT_DIR)
119+
list(APPEND UMPIRE_CMAKE_ARGS "-DCUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT_DIR}")
120+
endif()
112121
endif(ENABLE_CUDA)
113122
if (ENABLE_HIP)
114123
list(APPEND UMPIRE_CMAKE_ARGS

0 commit comments

Comments
 (0)