scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 08:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: enclose CUDA paths in quotes only in Win

Browse Source 
autoconf doesn't handle the quotation marks well, in this case it
doesn't take the path given by eg. `-L"/usr/local/cuda/lib64"`.

This allows at least correct configure in Linux, in Windows, user may
perhaps need to set LIBRARY_PATH env variable.
This commit is contained in:
Martin Pulec
2023-04-06 10:54:23 +02:00
parent b2777c0909
commit 8a34c2a27f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@@ -2079,10 +2079,6 @@ then
nvcc_minor=`"$NVCC" --version |grep release|sed 's/^.*release @<:@0-9@:>@@<:@0-9@:>@*\.\(@<:@0-9@:>@@<:@0-9@:>@*\).*$/\1/'`
AC_MSG_RESULT($nvcc_minor)
CUDA_INC="\"-I$CUDA_PATH/include\""
CUDA_COMPILER="$NVCC"
INC="$INC $CUDA_INC"
if test $ac_cv_sizeof_int_p -eq 8 -a $system = Linux
then
CUDA_LIB_PATH="$CUDA_PATH/lib64"
@@ -2090,8 +2086,9 @@ then
CUDA_LIB_PATH="$CUDA_PATH/lib"
fi
if test $system = Windows -a $nvcc_major -ge 8;
then
if test $system = Windows; then
CUDA_PATH="\"$CUDA_PATH\""
CUDA_LIB_PATH="\"$CUDA_LIB_PATH\""
if test $WORD_LEN = 64; then
CUDA_LIB_PATH="$CUDA_LIB_PATH/x64"
else
@@ -2099,7 +2096,10 @@ then
fi
fi
CUDA_LIB="-L\"$CUDA_LIB_PATH\" -lcudart"
CUDA_LIB="-L$CUDA_LIB_PATH -lcudart"
CUDA_INC="-I$CUDA_PATH/include"
CUDA_COMPILER="$NVCC"
INC="$INC $CUDA_INC"
if test $system = MacOSX; then
LDFLAGS="$LDFLAGS${LDFLAGS:+ }-rpath $CUDA_LIB_PATH"