diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 17:38:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-28 17:38:34 +0300 |
| commit | d310cbfa0fd0c424addf3f10c215869b790e3214 (patch) | |
| tree | 9ce256b1ef726fb5c93876cc085cc47b9f13e386 /intern/cycles | |
| parent | 1bde6c04f97e32f417b29c7d9f69a390234086ee (diff) | |
| parent | 312075e6883986fe2d1861811c7255b8898ab2cc (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | intern/cycles/util/CMakeLists.txt | 11 |
4 files changed, 18 insertions, 12 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 25e8e124885..a32911568c5 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -209,9 +209,9 @@ endif() if(WITH_CYCLES_OSL) add_definitions(-DWITH_OSL) - #osl 1.9.x + # osl 1.9.x add_definitions(-DOSL_STATIC_BUILD) - #pre 1.9 + # pre 1.9 add_definitions(-DOSL_STATIC_LIBRARY) include_directories( SYSTEM diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 66d955768a3..09379bf2017 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -32,6 +32,7 @@ set(SRC blender_viewport.cpp CCL_api.h + blender_device.h blender_object_cull.h blender_sync.h blender_session.h diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 78da584e132..4077a1ad516 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -636,13 +636,13 @@ endif() # OpenCL kernel -#set(KERNEL_PREPROCESSED ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl) -#add_custom_command( -# OUTPUT ${KERNEL_PREPROCESSED} -# COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -o ${KERNEL_PREPROCESSED} -# DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS}) -#add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED}) -#delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel) +# set(KERNEL_PREPROCESSED ${CMAKE_CURRENT_BINARY_DIR}/kernel_preprocessed.cl) +# add_custom_command( +# OUTPUT ${KERNEL_PREPROCESSED} +# COMMAND gcc -x c++ -E ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cl -I ${CMAKE_CURRENT_SOURCE_DIR}/../util/ -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -o ${KERNEL_PREPROCESSED} +# DEPENDS ${SRC_KERNEL} ${SRC_UTIL_HEADERS}) +# add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED}) +# delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_OPENCL_KERNELS}" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/opencl) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CUDA_KERNELS}" ${CYCLES_INSTALL_PATH}/source/kernel/kernels/cuda) diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index a6a6b6704f0..0063422aaef 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -41,9 +41,13 @@ if(WITH_CYCLES_STANDALONE) endif() if(CYCLES_STANDALONE_REPOSITORY) - list(APPEND INC_SYS ../../third_party/numaapi/include) + list(APPEND INC_SYS + ../../third_party/numaapi/include + ) else() - list(APPEND INC_SYS ../../numaapi/include) + list(APPEND INC_SYS + ../../numaapi/include + ) endif() set(SRC_HEADERS @@ -119,7 +123,7 @@ set(SRC_HEADERS util_types_float4_impl.h util_types_float8.h util_types_float8_impl.h - util_types_int2.h + util_types_int2.h util_types_int2_impl.h util_types_int3.h util_types_int3_impl.h @@ -140,6 +144,7 @@ set(SRC_HEADERS util_types_ushort4.h util_types_vector3.h util_types_vector3_impl.h + util_unique_ptr.h util_vector.h util_version.h util_view.h |