Commit: c8a551bf13edf711b93ea89cd3fcd244e4206cee
Author: Sergey Sharybin
Date: Wed Dec 30 18:51:35 2015 +0500
Branches: master
https://developer.blender.org/rBc8a551bf13edf711b93ea89cd3fcd244e4206cee
Cycles: Don't install CPU-related kernel files
===================================================================
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
index 20f2878..ea7899e 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -29,7 +29,6 @@ set(SRC
)
set(SRC_HEADERS
- kernel.h
kernel_accumulate.h
kernel_bake.h
kernel_camera.h
@@ -63,7 +62,10 @@ set(SRC_HEADERS
kernel_types.h
kernel_volume.h
kernel_work_stealing.h
+)
+set(SRC_KERNELS_CPU_HEADERS
+ kernel.h
kernels/cpu/kernel_cpu.h
kernels/cpu/kernel_cpu_impl.h
)
@@ -304,7 +306,15 @@ if(CXX_HAS_AVX2)
set_source_files_properties(kernels/cpu/kernel_avx2.cpp PROPERTIES
COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
endif()
-add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS}
${SRC_SVM_HEADERS} ${SRC_GEOM_HEADERS} ${SRC_SPLIT_HEADERS})
+add_library(cycles_kernel
+ ${SRC}
+ ${SRC_HEADERS}
+ ${SRC_KERNELS_CPU_HEADERS}
+ ${SRC_CLOSURE_HEADERS}
+ ${SRC_SVM_HEADERS}
+ ${SRC_GEOM_HEADERS}
+ ${SRC_SPLIT_HEADERS}
+)
if(WITH_CYCLES_CUDA)
add_dependencies(cycles_kernel cycles_kernel_cuda)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
