drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from internal branch.

Browse Source 
- Better support for win64.
This commit is contained in:
castano
2008-12-29 11:33:20 +00:00
parent 1975883bed
commit b8eb12afc1
7 changed files with 132 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/FindCUDA.cmake
View File

@ -34,9 +34,13 @@ ENDIF (CUDA_COMPILER)
FIND_PATH (CUDA_INCLUDE_PATH cuda_runtime.h
$ENV{CUDA_INC_PATH}
${CUDA_COMPILER_SUPER_DIR}/include
${CUDA_COMPILER_DIR}
DOC "The directory where CUDA headers reside")
FIND_PATH (CUTIL_INCLUDE_PATH cutil.h
"$ENV{NVSDKCUDA_ROOT}/common/inc"
"$ENV{PROGRAMFILES}/NVIDIA Corporation/NVIDIA CUDA SDK/common/inc"
DOC "The directory where the CUTIL headers reside")
FIND_LIBRARY (CUDA_RUNTIME_LIBRARY
NAMES cudart
PATHS
@ -45,6 +49,13 @@ FIND_LIBRARY (CUDA_RUNTIME_LIBRARY
${CUDA_COMPILER_DIR}
DOC "The CUDA runtime library")
FIND_LIBRARY (CUTIL_LIBRARY
NAMES cutil32 cutil64
PATHS
"$ENV{NVSDKCUDA_ROOT}/common/lib"
"$ENV{PROGRAMFILES}/NVIDIA Corporation/NVIDIA CUDA SDK/common/lib"
DOC "The CUTIL library")
IF (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY)
SET (CUDA_FOUND TRUE)
ELSE (CUDA_INCLUDE_PATH AND CUDA_RUNTIME_LIBRARY)
@ -56,6 +67,17 @@ SET (CUDA_LIBRARIES ${CUDA_RUNTIME_LIBRARY})
MARK_AS_ADVANCED (CUDA_FOUND CUDA_COMPILER CUDA_RUNTIME_LIBRARY)
IF (CUTIL_INCLUDE_PATH AND CUTIL_LIBRARY)
SET (CUTIL_FOUND 1 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise")
ELSE (CUTIL_INCLUDE_PATH AND CUTIL_LIBRARY)
SET (CUTIL_FOUND 0 CACHE STRING "Set to 1 if CUDA is found, 0 otherwise")
ENDIF (CUTIL_INCLUDE_PATH AND CUTIL_LIBRARY)
SET (CUTIL_LIBRARIES ${CUTIL_LIBRARY})
MARK_AS_ADVANCED (CUTIL_FOUND)
#SET(CUDA_OPTIONS "-ncfe")
SET(CUDA_OPTIONS "--host-compilation=C++")
@ -84,7 +106,7 @@ MACRO(GET_CUDA_INC_DIRS _cuda_INC_DIRS)
ENDMACRO(GET_CUDA_INC_DIRS)
# Get file dependencies.
MACRO (GET_CUFILE_DEPENDENCIES dependencies file)
GET_FILENAME_COMPONENT(filepath ${file} PATH)