include headers in cmake files (for IDE's)

4 files changed, 28 insertions, 11 deletions

diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py
index 60a46d3a1dd..db2f38d6518 100644
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -40,7 +40,16 @@ IGNORE = (
     "extern/eltopo/common/meshes/ObjLoader.hpp",
     "extern/eltopo/common/meshes/TriangleIndex.hpp",
     "extern/eltopo/common/meshes/meshloader.h",
-    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
+
+    # for bmesh branch only
+    "source/blender/bmesh/editmesh_tools.c",
+    "source/blender/bmesh/intern/in-progress/BME_conversions.c",
+    "source/blender/bmesh/tools/BME_bevel.c",
+    "source/blender/bmesh/tools/BME_dupe_ops.c",
+    "source/blender/bmesh/tools/BME_duplicate.c",
+    "source/blender/bmesh/tools/BME_extrude.c",
+    "source/blender/bmesh/tools/BME_weld.c",
     )
 
 UTF8_CHECK = True
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index fd07ffc7867..b34f3e49a26 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -225,6 +225,7 @@ set(SRC
 	BKE_sound.h
 	BKE_subsurf.h
 	BKE_suggestions.h
+	BKE_tessmesh.h
 	BKE_text.h
 	BKE_texture.h
 	BKE_unit.h
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 23cf2c71472..d21f24637b0 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -26,12 +26,14 @@
 
 set(INC 
 	.
+	intern
+	operators
 	../avi
+	../blenfont
+	../blenkernel
 	../blenlib
 	../blenloader
-	../blenkernel
-	operators
-	intern
+	../editors/include
 	../editors/mesh
 	../gpu
 	../ikplugin
@@ -40,20 +42,20 @@ set(INC
 	../makesrna
 	../modifiers
 	../nodes
-	../editors/include
 	../render/extern/include
 	../../../extern/glew/include
 	../../../intern/audaspace/intern
-	../../../intern/bsp/extern ../blenfont
+	../../../intern/bsp/extern
 	../../../intern/decimation/extern
 	../../../intern/elbeem/extern
 	../../../intern/guardedalloc
 	../../../intern/iksolver/extern
 	../../../intern/memutil
+	../../../intern/mikktspace
 	../../../intern/opennl/extern
 	../../../intern/smoke/extern
-	../../../intern/mikktspace
-    ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+	# XXX - BAD LEVEL CALL WM_api.h
+	../../../source/blender/windowmanager
 )
 
 set(INC_SYS
@@ -115,17 +117,21 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_LZO)
-	list(APPEND INC_SYS ../../../extern/lzo/minilzo)
 	add_definitions(-DWITH_LZO)
+	list(APPEND INC_SYS
+		../../../extern/lzo/minilzo
+	)
 endif()
 
 if(WITH_LZMA)
-	list(APPEND INC_SYS ../../../extern/lzma)
 	add_definitions(-DWITH_LZMA)
+	list(APPEND INC_SYS
+		../../../extern/lzma
+	)
 endif()
 
 if(MSVC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
 
 blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index e39e3e87399..843af272362 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -76,6 +76,7 @@ set(SRC
 	../include/ED_sound.h
 	../include/ED_space_api.h
 	../include/ED_text.h
+	../include/ED_toolmode.h
 	../include/ED_transform.h
 	../include/ED_types.h
 	../include/ED_util.h