minor

CMakeLists.txt

@@ -713,7 +713,7 @@ endif()
 ############################### CUDA ################################
 
 if(WITH_CUDA)
-    find_package(CUDA 3.2)
+    find_package(CUDA 4.0)
     
     if(CUDA_FOUND)
         set(HAVE_CUDA 1)
@@ -769,6 +769,9 @@ if(WITH_CUDA)
         set(OpenCV_CUDA_CC "${NVCC_FLAGS_EXTRA}")
         
         message(STATUS "CUDA NVCC flags: ${CUDA_NVCC_FLAGS}")
+    else()
+		unset(CUDA_ARCH_BIN CACHE)
+        unset(CUDA_ARCH_PTX CACHE)	
 	endif()	
 endif()
 

modules/gpu/CMakeLists.txt

@@ -35,11 +35,6 @@ if (HAVE_CUDA)
 endif()
 
 if (HAVE_CUDA)       
-    #get_filename_component(_path_to_findnpp "${CMAKE_CURRENT_LIST_FILE}" PATH)
-    #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_path_to_findnpp})
-    #find_package(NPP 3.2.16 REQUIRED)
-    #message(STATUS "NPP detected: " ${NPP_VERSION})
-       
     include_directories(${CUDA_INCLUDE_DIRS})
 
     if (UNIX OR APPLE)