From b2f89d63fcec47b7ea73ba2d515ec4f73752bef8 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 24 Jul 2024 13:38:42 +0200 Subject: [PATCH] configure: accept CUDA_PATH Although CUDA_PATH is advertised by help, it is actually immediately overriden with the content of CUDA_DIRECTORY env var even if unset/empty. From now, only override it only when CUDA_DIRECTORY is set and not empty (compat). --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d82ddfcff..d4f1a23d3 100644 --- a/configure.ac +++ b/configure.ac @@ -448,8 +448,9 @@ AC_ARG_VAR([SAGE_DIRECTORY], [Directory of your SAGE installation.]) # CUDA lookup order: # 1) --with-cuda # 2) CUDA_DIRECTORY env variable -# 3) default system path (PATH, LD_LIBRARY_PATH, C_INCLUDE_PATH/CPATH) -# 4) default CUDA path +# 3) CUDA_PATH env variable +# 4) default system path (PATH, LD_LIBRARY_PATH, C_INCLUDE_PATH/CPATH) +# 5) default CUDA path CUDA_COMPUTE_ARGS="" CUDA_COMPILER="" @@ -459,7 +460,9 @@ CUDA_LIB= NVCC= CUDA_LIB_PATH= FOUND_CUDA=no -CUDA_PATH=$CUDA_DIRECTORY +if test -n "$CUDA_DIRECTORY"; then + CUDA_PATH=$CUDA_DIRECTORY +fi AC_ARG_ENABLE(cuda, AS_HELP_STRING([--disable-cuda], [disable all CUDA code]),