Merged changes in the trunk up to revision 41768.
[blender-staging.git] / source / blender / CMakeLists.txt
index d4d572aca8ecd329bd299e30b54f32c5cb67714c..6a6e71eac227395de7c844d25c4861bc64019016 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -40,6 +39,7 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curve_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_customdata_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_documentation.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_dynamicpaint_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_effect_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fileglobal_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_genfile.h
@@ -50,6 +50,7 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
@@ -73,6 +74,7 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_smoke_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sound_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_space_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_speaker_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_text_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h
@@ -82,6 +84,8 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
 )
 
 add_subdirectory(editors)
@@ -91,7 +95,6 @@ add_subdirectory(blenlib)
 add_subdirectory(render)
 add_subdirectory(blenfont)
 add_subdirectory(blenloader)
-add_subdirectory(readblenfile)
 add_subdirectory(blenpluginapi)
 add_subdirectory(ikplugin)
 add_subdirectory(gpu)
@@ -124,6 +127,5 @@ if(WITH_PYTHON)
 endif()
 
 if(WITH_OPENCOLLADA)
-  add_subdirectory(collada)
+       add_subdirectory(collada)
 endif()
-