Revision: 39547
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39547
Author: campbellbarton
Date: 2011-08-19 10:34:24 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
include headers in cmake files (for IDE's)
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/util/CMakeLists.txt
Modified:
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
2011-08-19 09:34:37 UTC (rev 39546)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
2011-08-19 10:34:24 UTC (rev 39547)
@@ -40,7 +40,16 @@
"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
Modified: branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
2011-08-19 09:34:37 UTC (rev 39546)
+++ branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
2011-08-19 10:34:24 UTC (rev 39547)
@@ -225,6 +225,7 @@
BKE_sound.h
BKE_subsurf.h
BKE_suggestions.h
+ BKE_tessmesh.h
BKE_text.h
BKE_texture.h
BKE_unit.h
Modified: branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt 2011-08-19
09:34:37 UTC (rev 39546)
+++ branches/bmesh/blender/source/blender/bmesh/CMakeLists.txt 2011-08-19
10:34:24 UTC (rev 39547)
@@ -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 @@
../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 @@
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}")
Modified: branches/bmesh/blender/source/blender/editors/util/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/source/blender/editors/util/CMakeLists.txt
2011-08-19 09:34:37 UTC (rev 39546)
+++ branches/bmesh/blender/source/blender/editors/util/CMakeLists.txt
2011-08-19 10:34:24 UTC (rev 39547)
@@ -76,6 +76,7 @@
../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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
