Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-05-05 15:14:09 +02:00
parent 4e5a328e55 bb7a23bdff
commit e7470c9dbe
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/cmake/platform/platform_unix.cmake
View File

@@ -57,6 +57,7 @@ if(EXISTS ${LIBDIR})
set(BOOST_ROOT ${LIBDIR}/boost) set(BOOST_ROOT ${LIBDIR}/boost)
set(BOOST_LIBRARYDIR ${LIBDIR}/boost/lib) set(BOOST_LIBRARYDIR ${LIBDIR}/boost/lib)
set(Boost_NO_SYSTEM_PATHS ON) set(Boost_NO_SYSTEM_PATHS ON)
set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
endif() endif()
if(WITH_STATIC_LIBS) if(WITH_STATIC_LIBS)

4
intern/cycles/device/cuda/device_cuda_impl.cpp
View File

@@ -421,10 +421,10 @@ string CUDADevice::compile_kernel(const DeviceRequestedFeatures &requested_featu
nvcc_cuda_version % 10); nvcc_cuda_version % 10);
return string(); return string();
} }
else if (nvcc_cuda_version != 101) { else if (!(nvcc_cuda_version == 101 || nvcc_cuda_version == 102)) {
printf( printf(
"CUDA version %d.%d detected, build may succeed but only " "CUDA version %d.%d detected, build may succeed but only "
"CUDA 10.1 is officially supported.\n", "CUDA 10.1 and 10.2 are officially supported.\n",
nvcc_cuda_version / 10, nvcc_cuda_version / 10,
nvcc_cuda_version % 10); nvcc_cuda_version % 10);
} }

4
intern/cycles/kernel/CMakeLists.txt
View File

@@ -375,11 +375,11 @@ if(WITH_CYCLES_CUDA_BINARIES)
set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}") set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
# warn for other versions # warn for other versions
if(CUDA_VERSION MATCHES "101") if((CUDA_VERSION MATCHES "101") OR (CUDA_VERSION MATCHES "102"))
else() else()
message(WARNING message(WARNING
"CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, " "CUDA version ${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR} detected, "
"build may succeed but only CUDA 10.1 is officially supported") "build may succeed but only CUDA 10.1 and 10.2 are officially supported")
endif() endif()
# build for each arch # build for each arch