[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51449] trunk/blender/intern/cycles/kernel /CMakeLists.txt: Cycles:

[Thomas Dinges]

Revision: 51449
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51449
Author:   dingto
Date:     2012-10-20 14:08:49 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Cycles:
* Build system fixes for closure refactor. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/CMakeLists.txt

Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt	2012-10-20 13:30:32 UTC (rev 51448)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt	2012-10-20 14:08:49 UTC (rev 51449)
@@ -45,10 +45,12 @@
 	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 @@
 	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 @@
 		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 @@
 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_SVM_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 @@
 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)