From 2d38f4fb2c88982ea63a6c99d7aa5e49e6b38e26 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Fri, 26 Jun 2009 06:34:19 +0000
Subject: [PATCH] Update cmake scripts to use new FindCUDA package.

---
 src/CMakeLists.txt      | 7 +------
 src/nvtt/CMakeLists.txt | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ecbced9..344bf38 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,15 +48,10 @@ ELSE(CG_FOUND)
 ENDIF(CG_FOUND)
 
 # CUDA
-INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake)
+FIND_PACKAGE(CUDA)
 IF(CUDA_FOUND)
 	SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise")
 	MESSAGE(STATUS "Looking for CUDA - found")
-	IF(CUTIL_FOUND)
-		MESSAGE(STATUS "Looking for CUTIL - found")
-	ELSE(CUTIL_FOUND)
-		MESSAGE(STATUS "Looking for CUTIL - not found")
-	ENDIF(CUTIL_FOUND)
 ELSE(CUDA_FOUND)
 	MESSAGE(STATUS "Looking for CUDA - not found")
 ENDIF(CUDA_FOUND)
diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt
index cab5f4a..2e36f04 100644
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@@ -32,13 +32,13 @@ SET(NVTT_SRCS
 	cuda/CudaCompressDXT.h
 	cuda/CudaCompressDXT.cpp)
 
-IF(CUDA_FOUND)
+IF (CUDA_FOUND)
 	ADD_DEFINITIONS(-DHAVE_CUDA)
-	WRAP_CUDA(CUDA_SRCS cuda/CompressKernel.cu)
+	CUDA_COMPILE(CUDA_SRCS cuda/CompressKernel.cu)
 	SET(NVTT_SRCS ${NVTT_SRCS} ${CUDA_SRCS})
 	SET(LIBS ${LIBS} ${CUDA_LIBRARIES})
-	INCLUDE_DIRECTORIES(${CUDA_INCLUDE_PATH})
-ENDIF(CUDA_FOUND)
+	INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
+ENDIF (CUDA_FOUND)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})