diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-10-20 18:08:49 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-10-20 18:08:49 +0400 |
| commit | 950524722cc3cebbe23f7eaa0caad097c329eac3 (patch) | |
| tree | c9a8e0b93d0dc8d696b72da24a6d5ba12308baed /intern | |
| parent | a9e2e2279780ec2fb58e6820b9cad95ba03f4cad (diff) | |
Cycles:
* Build system fixes for closure refactor.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 6ba25881910..d24c7d4128c 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -45,10 +45,12 @@ set(SRC_HEADERS kernel_types.h ) -set(SRC_SVM_HEADERS +set(SRC_CLOSURE_HEADERS closure/bsdf.h closure/bsdf_ashikhmin_velvet.h + closure/bsdf_diffuse.h closure/bsdf_microfacet.h + closure/bsdf_oren_nayar.h closure/bsdf_reflection.h closure/bsdf_refraction.h closure/bsdf_transparent.h @@ -56,7 +58,8 @@ set(SRC_SVM_HEADERS closure/bsdf_westin.h closure/emissive.h closure/volume.h - +) +set(SRC_SVM_HEADERS svm/svm.h svm/svm_attribute.h svm/svm_bsdf.h @@ -109,7 +112,7 @@ if(WITH_CYCLES_CUDA_BINARIES) set(CUDA_BITS 32) endif() - set(cuda_sources kernel.cu ${SRC_HEADERS} ${SRC_SVM_HEADERS} ${SRC_UTIL_HEADERS}) + set(cuda_sources kernel.cu ${SRC_HEADERS} ${SRC_SVM_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_UTIL_HEADERS}) set(cuda_cubins) foreach(arch ${CYCLES_CUDA_BINARIES_ARCH}) @@ -138,7 +141,7 @@ endif() include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) -add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_SVM_HEADERS}) +add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS}) if(WITH_CYCLES_OPTIMIZED_KERNEL) set_source_files_properties(kernel_optimized.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_OPTIMIZED_KERNEL_FLAGS}") @@ -161,6 +164,7 @@ endif() delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cu" ${CYCLES_INSTALL_PATH}/kernel) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel) +delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_CLOSURE_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/closure) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel/svm) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/kernel) |