[arrayfire] 01/26: Remove cache path from NVVM path

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit 4a1e364dd64925fb105b83b4938e347e4c55f52b
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Sat Jun 13 13:53:01 2015 -0400

    Remove cache path from NVVM path
---
 CMakeModules/FindNVVM.cmake | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeModules/FindNVVM.cmake b/CMakeModules/FindNVVM.cmake
index a34947e..5ffe2d4 100644
--- a/CMakeModules/FindNVVM.cmake
+++ b/CMakeModules/FindNVVM.cmake
@@ -4,23 +4,29 @@
 
 # libNVVM
 if(NOT DEFINED ENV{LIBNVVM_HOME})
-  set(LIBNVVM_HOME "${CUDA_TOOLKIT_ROOT_DIR}/nvvm" CACHE PATH "Path to NVVM.")
+  set(LIBNVVM_HOME "${CUDA_TOOLKIT_ROOT_DIR}/nvvm")
 else()
-  set(LIBNVVM_HOME "$ENV{LIBNVVM_HOME}" CACHE PATH "Path to NVVM.")
+  set(LIBNVVM_HOME "$ENV{LIBNVVM_HOME}")
 endif()
 message(STATUS "Using LIBNVVM_HOME: ${LIBNVVM_HOME}")
 
+IF(${CUDA_VERSION_MAJOR} LESS 7)
+	SET(NVVM_DLL_VERSION 20_0)
+ELSE(${CUDA_VERSION_MAJOR} LESS 7)
+	SET(NVVM_DLL_VERSION 30_0)
+ENDIF(${CUDA_VERSION_MAJOR} LESS 7)
+
 if (CMAKE_SIZEOF_VOID_P STREQUAL "8")
   if (WIN32)
     set (CUDA_LIB_SEARCH_PATH "${CUDA_TOOLKIT_ROOT_DIR}/lib/x64")
-    set (NVVM_DLL_NAME nvvm64_20_0.dll)
+    set (NVVM_DLL_NAME nvvm64_${NVVM_DLL_VERSION}.dll)
   else ()
     set (CUDA_LIB_SEARCH_PATH "")
   endif()
 else()
   if (WIN32)
     set (CUDA_LIB_SEARCH_PATH "${CUDA_TOOLKIT_ROOT_DIR}/lib/Win32")
-    set (NVVM_DLL_NAME nvvm32_20_0.dll)
+    set (NVVM_DLL_NAME nvvm32_${NVVM_DLL_VERSION}.dll)
   else()
     set (CUDA_LIB_SEARCH_PATH "")
   endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git