[Bf-blender-cvs] [fd26a32] master: Fix T40119, CUDA Toolkit version mismatch

[Thomas Dinges]

Commit: fd26a32aa5336b6c5fd3e8a9fc5fc618b2590bb1
Author: Thomas Dinges
Date:   Sat May 10 01:26:04 2014 +0200
https://developer.blender.org/rBfd26a32aa5336b6c5fd3e8a9fc5fc618b2590bb1

Fix T40119, CUDA Toolkit version mismatch

===================================================================

M	intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index c667b88..9139a75 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -297,12 +297,11 @@ public:
 			return "";
 		}
 		if(cuda_version < 50) {
-			printf("Unsupported CUDA version %d.%d detected, you need CUDA 5.0.\n", cuda_version/10, cuda_version%10);
+			printf("Unsupported CUDA version %d.%d detected, you need CUDA 6.0.\n", cuda_version/10, cuda_version%10);
 			return "";
 		}
-
-		else if(cuda_version > 50)
-			printf("CUDA version %d.%d detected, build may succeed but only CUDA 5.0 is officially supported.\n", cuda_version/10, cuda_version%10);
+		else if(cuda_version != 60)
+			printf("CUDA version %d.%d detected, build may succeed but only CUDA 6.0 is officially supported.\n", cuda_version/10, cuda_version%10);
 
 		/* compile */
 		string kernel = path_join(kernel_path, "kernel.cu");