kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+. 

CUDA 3.2 on Windows systems changed the layout of the library paths.  This adds the extra
directories needed to locate the new files.

I also explicitly disable emulation mode for CUDA 3.1+.  This feature was deprecated in
3.0 and ultimately removed in 3.1.  The script errors out if CUDA_BUILD_EMULATION is
turned on.  I didn't want to ignore emulation mode (even with a warning - which most
people may not even see) and have users confused as to why it wasn't working.
This commit is contained in:
James Bigler 2010-09-10 11:48:38 -06:00
parent f2b4a46677
commit 4f0636e979
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Modules/FindCUDA.cmake
View File

@ -514,11 +514,19 @@ set (CUDA_INCLUDE_DIRS ${CUDA_TOOLKIT_INCLUDE})
macro(FIND_LIBRARY_LOCAL_FIRST _var _names _doc) macro(FIND_LIBRARY_LOCAL_FIRST _var _names _doc)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_cuda_64bit_lib_dir "${CUDA_TOOLKIT_ROOT_DIR}/lib64") # CUDA 3.2+ on Windows moved the library directoryies, so we need the new
# and old paths.
set(_cuda_64bit_lib_dir
"${CUDA_TOOLKIT_ROOT_DIR}/lib/x64"
"${CUDA_TOOLKIT_ROOT_DIR}/lib64"
)
endif() endif()
# CUDA 3.2+ on Windows moved the library directories, so we need to new
# (lib/Win32) and the old path (lib).
find_library(${_var} find_library(${_var}
NAMES ${_names} NAMES ${_names}
PATHS ${_cuda_64bit_lib_dir} PATHS ${_cuda_64bit_lib_dir}
"${CUDA_TOOLKIT_ROOT_DIR}/lib/Win32"
"${CUDA_TOOLKIT_ROOT_DIR}/lib" "${CUDA_TOOLKIT_ROOT_DIR}/lib"
ENV CUDA_LIB_PATH ENV CUDA_LIB_PATH
DOC ${_doc} DOC ${_doc}
@ -578,9 +586,20 @@ macro(FIND_CUDA_HELPER_LIBS _name)
mark_as_advanced(CUDA_${_name}_LIBRARY) mark_as_advanced(CUDA_${_name}_LIBRARY)
endmacro(FIND_CUDA_HELPER_LIBS) endmacro(FIND_CUDA_HELPER_LIBS)
#######################
# Disable emulation for v3.1 onward
if(CUDA_VERSION VERSION_GREATER "3.0")
if(CUDA_BUILD_EMULATION)
message(FATAL_ERROR "CUDA_BUILD_EMULATION is not supported in version 3.1 and onwards. You must disable it to proceed. You have version ${CUDA_VERSION}.")
endif()
endif()
# Search for cufft and cublas libraries. # Search for cufft and cublas libraries.
find_cuda_helper_libs(cufftemu) if(CUDA_VERSION VERSION_LESS "3.1")
find_cuda_helper_libs(cublasemu) # Emulation libraries aren't available in version 3.1 onward.
find_cuda_helper_libs(cufftemu)
find_cuda_helper_libs(cublasemu)
endif()
find_cuda_helper_libs(cufft) find_cuda_helper_libs(cufft)
find_cuda_helper_libs(cublas) find_cuda_helper_libs(cublas)