From 50f432b1e0f49820db9d67526946bd794e2b05d6 Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Sat, 4 Jun 2016 11:42:48 +0200 Subject: CMake, minor changes to make Visual studio 2015 use a compatible numpy and the standard cmake CUDA/NVCC arguments flag allowing 2015 build to use msvc 2013 for cuda --- intern/cycles/kernel/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'intern') diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 7c2fc1e4b14..61c484df094 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -234,6 +234,7 @@ if(WITH_CYCLES_CUDA_BINARIES) OUTPUT ${cuda_cubin} COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} + ${CUDA_NVCC_FLAGS} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernels/cuda/kernel.cu -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} -- cgit v1.2.3