Merging r38343 through r38363 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Jul 2011 16:53:54 +0000 (16:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 13 Jul 2011 16:53:54 +0000 (16:53 +0000)
1  2 
CMakeLists.txt
source/blender/editors/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
  #
  # ***** END GPL LICENSE BLOCK *****
  
- add_subdirectory(animation)
- add_subdirectory(armature)
- add_subdirectory(curve)
+ if(WITH_BLENDER)
+       add_subdirectory(animation)
+       add_subdirectory(armature)
+       add_subdirectory(curve)
+       add_subdirectory(gpencil)
+       add_subdirectory(interface)
+       add_subdirectory(mesh)
+       add_subdirectory(metaball)
+       add_subdirectory(object)
+       add_subdirectory(physics)
+       add_subdirectory(render)
+       add_subdirectory(screen)
+       add_subdirectory(sculpt_paint)
+       add_subdirectory(sound)
+       add_subdirectory(space_action)
+       add_subdirectory(space_api)
+       add_subdirectory(space_buttons)
++      add_subdirectory(space_clip)
+       add_subdirectory(space_console)
+       add_subdirectory(space_file)
+       add_subdirectory(space_graph)
+       add_subdirectory(space_image)
+       add_subdirectory(space_info)
+       add_subdirectory(space_logic)
+       add_subdirectory(space_nla)
+       add_subdirectory(space_node)
+       add_subdirectory(space_outliner)
+       add_subdirectory(space_script)
+       add_subdirectory(space_sequencer)
+       add_subdirectory(space_sound)
+       add_subdirectory(space_text)
+       add_subdirectory(space_time)
+       add_subdirectory(space_userpref)
+       add_subdirectory(space_view3d)
+       add_subdirectory(transform)
+       add_subdirectory(util)
+       add_subdirectory(uvedit)
+ endif()
  add_subdirectory(datafiles)
- add_subdirectory(gpencil)
- add_subdirectory(interface)
- add_subdirectory(mesh)
- add_subdirectory(metaball)
- add_subdirectory(object)
- add_subdirectory(physics)
- add_subdirectory(render)
- add_subdirectory(screen)
- add_subdirectory(sculpt_paint)
- add_subdirectory(sound)
- add_subdirectory(space_action)
- add_subdirectory(space_api)
- add_subdirectory(space_buttons)
- add_subdirectory(space_clip)
- add_subdirectory(space_console)
- add_subdirectory(space_file)
- add_subdirectory(space_graph)
- add_subdirectory(space_image)
- add_subdirectory(space_info)
- add_subdirectory(space_logic)
- add_subdirectory(space_nla)
- add_subdirectory(space_node)
- add_subdirectory(space_outliner)
- add_subdirectory(space_script)
- add_subdirectory(space_sequencer)
- add_subdirectory(space_sound)
- add_subdirectory(space_text)
- add_subdirectory(space_time)
- add_subdirectory(space_userpref)
- add_subdirectory(space_view3d)
- add_subdirectory(transform)
- add_subdirectory(util)
- add_subdirectory(uvedit)