[Bf-blender-cvs] [6ba1281] master: CMake: correct file listing

Campbell Barton noreply at git.blender.org
Sun May 17 09:27:33 CEST 2015


Commit: 6ba128129d871b656623ce231fd7cba7a4d7af1d
Author: Campbell Barton
Date:   Sun May 17 16:09:15 2015 +1000
Branches: master
https://developer.blender.org/rB6ba128129d871b656623ce231fd7cba7a4d7af1d

CMake: correct file listing

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

M	source/blender/blenlib/CMakeLists.txt
M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/editors/util/CMakeLists.txt
M	source/blender/makesdna/intern/CMakeLists.txt

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

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 797bdaa..e39202d 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -155,6 +155,7 @@ set(SRC
 	BLI_listbase.h
 	BLI_math.h
 	BLI_math_base.h
+	BLI_math_bits.h
 	BLI_math_color.h
 	BLI_math_color_blend.h
 	BLI_math_geom.h
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 014bcb4..dcdb14d 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -25,8 +25,8 @@
 
 set(INC
 	.
-	./intern
-	./util
+	intern
+	util
 	../blenkernel
 	../blenlib
 	../bmesh
@@ -109,7 +109,9 @@ if(WITH_LEGACY_DEPSGRAPH)
 endif()
 
 if(WITH_BOOST)
-	list(APPEND INC_SYS ${BOOST_INCLUDE_DIR})
+	list(APPEND INC_SYS
+		${BOOST_INCLUDE_DIR}
+	)
 	add_definitions(-DHAVE_BOOST_FUNCTION_BINDINGS)
 endif()
 
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index d1495d8..47894e1 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -70,6 +70,7 @@ set(SRC
 	../include/ED_node.h
 	../include/ED_numinput.h
 	../include/ED_object.h
+	../include/ED_outliner.h
 	../include/ED_paint.h
 	../include/ED_particle.h
 	../include/ED_physics.h
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 08d2f93..be097c0 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -74,7 +74,7 @@ set(INC_SYS
 
 set(SRC
 	dna_genfile.c
-	dna.c
+	${CMAKE_CURRENT_BINARY_DIR}/dna.c
 	${SRC_DNA_INC}
 )




More information about the Bf-blender-cvs mailing list