[Bf-blender-cvs] [f616caa] master: CMake: Fix compilation error when toolkit gives empty result

Sergey Sharybin noreply at git.blender.org
Mon May 9 16:05:16 CEST 2016


Commit: f616caa31594bafbd0010cb5f3e0620f115d61dc
Author: Sergey Sharybin
Date:   Mon May 9 16:05:02 2016 +0200
Branches: master
https://developer.blender.org/rBf616caa31594bafbd0010cb5f3e0620f115d61dc

CMake: Fix compilation error when toolkit gives empty result

Should we also check whether toolkit exist perhaps?

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 9f3fb66..7080e83 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -195,8 +195,8 @@ if(WITH_CYCLES_CUDA_BINARIES)
 
 	# CUDA version
 	execute_process(COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
-	string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT})
-	string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
+	string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR "${NVCC_OUT}")
+	string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR "${NVCC_OUT}")
 	set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
 
 	# warn for other versions




More information about the Bf-blender-cvs mailing list