[Bf-blender-cvs] [c3bc2fd] master: CMake: cleanup and add include

Campbell Barton noreply at git.blender.org
Sat Jan 4 03:20:10 CET 2014


Commit: c3bc2fd941670b2444f36358fb84effe873373cf
Author: Campbell Barton
Date:   Sat Jan 4 13:13:29 2014 +1100
https://developer.blender.org/rBc3bc2fd941670b2444f36358fb84effe873373cf

CMake: cleanup and add include

===================================================================

M	intern/cycles/kernel/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/editors/util/CMakeLists.txt

===================================================================

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 8609098..998d1a3 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -199,7 +199,9 @@ endif()
 
 if(WITH_CYCLES_OPTIMIZED_KERNEL_SSE41)
 	set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}")
-	list(APPEND SRC kernel_sse41.cpp)
+	list(APPEND SRC
+		kernel_sse41.cpp
+	)
 endif()
 
 add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS})
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 18ed401..815ba23 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -262,6 +262,7 @@ set(SRC
 
 	depsgraph_private.h
 	nla_private.h
+	tracking_private.h
 	intern/CCGSubSurf.h
 	intern/pbvh_intern.h
 )
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 89d1bc7..9f515bf 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -100,7 +100,9 @@ endif()
 
 if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
-	set(INC ${INC} ../../python)
+	list(APPEND INC
+		../../python
+	)
 endif()
 
 blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list