Cycles Merge:

* It seems we have a problem compiling the CUDA kernel at runtime on Windows,
  will need to investigate more how to solve this best, CPU render should go
  fine though.
* Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.

CMakeLists.txt

@@ -519,7 +519,6 @@ if(UNIX AND NOT APPLE)
 	if(WITH_OPENIMAGEIO)
 		set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
 
-		set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
 		find_package(OpenImageIO)
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})

intern/cycles/device/device_cuda.cpp

@@ -242,7 +242,7 @@ public:
 
 		path_create_directories(cubin);
 
-		string command = string_printf("%s -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
+		string command = string_printf("\"%s\" -arch=sm_%d%d -m%d --cubin \"%s\" --use_fast_math "
 			"-o \"%s\" --ptxas-options=\"-v\" --maxrregcount=%d --opencc-options -OPT:Olimit=0 -I\"%s\" -DNVCC",
 			nvcc.c_str(), major, minor, machine, kernel.c_str(), cubin.c_str(), maxreg, include.c_str());