CMake, minor changes to make Visual studio 2015 use a compatible numpy and
authorMartijn Berger <martijn.berger@gmail.com>
Sat, 4 Jun 2016 09:42:48 +0000 (11:42 +0200)
committerMartijn Berger <martijn.berger@gmail.com>
Sat, 4 Jun 2016 09:42:48 +0000 (11:42 +0200)
the standard cmake CUDA/NVCC arguments flag allowing 2015 build to use
msvc 2013 for cuda

intern/cycles/kernel/CMakeLists.txt
source/creator/CMakeLists.txt

index 7c2fc1e4b14439b30d69606f167d8685c0526d1b..61c484df094d97afe96e8f7da8e19d578b6ddc0b 100644 (file)
@@ -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}
index e3cbfbf838bdb8efa851fd7cb19e60b20fd0d251..122c10ef216c65e522a9527ce8ff72beaa967499 100644 (file)
@@ -692,6 +692,10 @@ elseif(WIN32)
                        )
 
                        if(WITH_PYTHON_INSTALL_NUMPY)
+                               set(PYTHON_NUMPY_VERSION 1.9)
+                               if(MSVC_VERSION EQUAL 1900)
+                                       set(PYTHON_NUMPY_VERSION 1.11)
+                               endif()
                                add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
                                        COMMAND ${CMAKE_COMMAND} -E
                                                make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
@@ -699,9 +703,9 @@ elseif(WIN32)
                                add_custom_command(
                                        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
                                        COMMAND ${CMAKE_COMMAND} -E
-                                               tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz"
+                                               tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz"
                                        DEPENDS
-                                               ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz
+                                               ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz
                                                ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
                                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages
                                )