[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41718] trunk/blender: add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without .

Campbell Barton ideasman42 at gmail.com
Thu Nov 10 07:05:23 CET 2011


Revision: 41718
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41718
Author:   campbellbarton
Date:     2011-11-10 06:05:22 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_consistency_check.py
    trunk/blender/intern/cycles/device/CMakeLists.txt
    trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
    trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    trunk/blender/intern/cycles/render/CMakeLists.txt
    trunk/blender/intern/cycles/util/CMakeLists.txt
    trunk/blender/source/blender/nodes/CMakeLists.txt

Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py	2011-11-10 06:05:22 UTC (rev 41718)
@@ -93,6 +93,9 @@
     # print(f)
 
     def is_definition(l, f, i, name):
+        if l.startswith("unset("):
+            return False
+
         if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
             if len(l.split()) > 1:
                 raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))

Modified: trunk/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/device/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/intern/cycles/device/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -21,6 +21,7 @@
 
 set(SRC_HEADERS
 	device.h
+	device_memory.h
 	device_intern.h
 	device_network.h
 )

Modified: trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -1,7 +1,7 @@
 
 set(INC
 	.
-	../
+	..
 	../svm
 	../../render
 	../../util

Modified: trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -50,6 +50,8 @@
 
 set(SRC_OSL_HEADERS
 	node_texture.h
+	node_color.h
+	node_fresnel.h
 	stdosl.h
 )
 

Modified: trunk/blender/intern/cycles/render/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/render/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/intern/cycles/render/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -16,6 +16,7 @@
 	buffers.cpp
 	camera.cpp
 	film.cpp
+	# film_response.cpp  # XXX, why isnt this in?
 	filter.cpp
 	graph.cpp
 	image.cpp
@@ -40,6 +41,7 @@
 	buffers.h
 	camera.h
 	film.h
+	# film_response.h  # XXX, why isnt this in?
 	filter.h
 	graph.h
 	image.h

Modified: trunk/blender/intern/cycles/util/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/util/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/intern/cycles/util/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -33,6 +33,7 @@
 	util_cuda.h
 	util_debug.h
 	util_dynlib.h
+	util_foreach.h
 	util_function.h
 	util_hash.h
 	util_image.h

Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt	2011-11-10 04:17:43 UTC (rev 41717)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt	2011-11-10 06:05:22 UTC (rev 41718)
@@ -131,6 +131,7 @@
 	shader/nodes/node_shader_vectMath.c
 	shader/nodes/node_shader_attribute.c
 	shader/nodes/node_shader_background.c
+	# shader/nodes/node_shader_bsdf_anisotropic.c  # XXX, why not included?
 	shader/nodes/node_shader_bsdf_diffuse.c
 	shader/nodes/node_shader_bsdf_glossy.c
 	shader/nodes/node_shader_bsdf_glass.c




More information about the Bf-blender-cvs mailing list