From 817652c56cd9e0b9d3f85147084e687db43d4bc7 Mon Sep 17 00:00:00 2001 From: castano Date: Mon, 17 Dec 2007 03:46:59 +0000 Subject: [PATCH] Do not look for cuda.dll anymore. --- cmake/FindCUDA.cmake | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake index c86437d..ea69cc8 100644 --- a/cmake/FindCUDA.cmake +++ b/cmake/FindCUDA.cmake @@ -4,7 +4,7 @@ # # CUDA_FOUND # CUDA_INCLUDE_PATH -# CUDA_LIBRARY +# CUDA_RUNTIME_LIBRARY # CUDA_COMPILER # # It will also define the following macro: @@ -36,14 +36,6 @@ FIND_PATH (CUDA_INCLUDE_PATH cuda_runtime.h ${CUDA_COMPILER_SUPER_DIR}/include ${CUDA_COMPILER_DIR} DOC "The directory where CUDA headers reside") - -FIND_LIBRARY (CUDA_LIBRARY - NAMES cuda - PATHS - $ENV{CUDA_LIB_PATH} - ${CUDA_COMPILER_SUPER_DIR}/lib - ${CUDA_COMPILER_DIR} - DOC "The CUDA library") FIND_LIBRARY (CUDA_RUNTIME_LIBRARY NAMES cudart @@ -53,15 +45,15 @@ FIND_LIBRARY (CUDA_RUNTIME_LIBRARY ${CUDA_COMPILER_DIR} DOC "The CUDA runtime library") -IF (CUDA_INCLUDE_PATH AND CUDA_LIBRARY AND CUDA_RUNTIME_LIBRARY) +IF (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY) SET (CUDA_FOUND 1 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise") -ELSE (CUDA_INCLUDE_PATH AND CUDA_LIBRARY AND CUDA_RUNTIME_LIBRARY) +ELSE (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY) SET (CUDA_FOUND 0 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise") -ENDIF (CUDA_INCLUDE_PATH AND CUDA_LIBRARY AND CUDA_RUNTIME_LIBRARY) +ENDIF (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY) -SET (CUDA_LIBRARIES ${CUDA_LIBRARY} ${CUDA_RUNTIME_LIBRARY}) +SET (CUDA_LIBRARIES ${CUDA_RUNTIME_LIBRARY}) -MARK_AS_ADVANCED (CUDA_FOUND CUDA_COMPILER CUDA_LIBRARY CUDA_RUNTIME_LIBRARY) +MARK_AS_ADVANCED (CUDA_FOUND CUDA_COMPILER CUDA_RUNTIME_LIBRARY) #SET(CUDA_OPTIONS "-ncfe")