From 12e4c52c5afcef1f110614e442586c65e54c97b8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 22 Feb 2011 06:23:07 +0000 Subject: cmake was using dna source list with the variable out of scope, possibly causing dependency problems. --- source/blender/CMakeLists.txt | 60 +++++++++++++++++++++++++ source/blender/makesdna/CMakeLists.txt | 63 --------------------------- source/blender/makesdna/intern/CMakeLists.txt | 3 ++ 3 files changed, 63 insertions(+), 63 deletions(-) (limited to 'source') diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index c1696b14232..263d81fab0a 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -24,6 +24,66 @@ # # ***** END GPL LICENSE BLOCK ***** +set(SRC_DNA_INC + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ID.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_action_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_actuator_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_anim_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_armature_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_boid_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_brush_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_camera_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_cloth_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_color_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_constraint_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_controller_types.h + ${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_effect_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fileglobal_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_genfile.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_group_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_image_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ipo_types.h + ${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_listBase.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meta_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_packedFile_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_particle_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_property_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_screen_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sdna_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sensor_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sequence_types.h + ${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_text_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vec_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vfont_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view2d_types.h + ${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 +) + add_subdirectory(editors) add_subdirectory(windowmanager) add_subdirectory(blenkernel) diff --git a/source/blender/makesdna/CMakeLists.txt b/source/blender/makesdna/CMakeLists.txt index b1e1b589c6e..e02b33b92c1 100644 --- a/source/blender/makesdna/CMakeLists.txt +++ b/source/blender/makesdna/CMakeLists.txt @@ -24,67 +24,4 @@ # # ***** END GPL LICENSE BLOCK ***** -# Use PARENT_SCOPE so makesrna can access. -set(SRC_DNA_INC - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_ID.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_action_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_actuator_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_anim_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_armature_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_boid_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_brush_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_camera_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_cloth_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_color_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_constraint_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_controller_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_curve_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_customdata_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_documentation.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_effect_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_fileglobal_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_genfile.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_gpencil_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_group_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_image_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_ipo_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_key_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_lamp_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_lattice_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_listBase.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_material_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_mesh_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_meshdata_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_meta_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_modifier_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_nla_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_node_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_object_fluidsim.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_object_force.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_object_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_outliner_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_packedFile_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_particle_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_property_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_scene_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_screen_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_sdna_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_sensor_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_sequence_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_smoke_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_sound_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_space_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_text_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_texture_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_userdef_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_vec_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_vfont_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_view2d_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_view3d_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_windowmanager_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/DNA_world_types.h - - PARENT_SCOPE -) - add_subdirectory(intern) diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 09ad7a67c39..bb95e2c0fbc 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -57,6 +57,9 @@ add_custom_command( ) # Build bf_dna library +set(INC +) + set(SRC dna_genfile.c dna.c -- cgit v1.2.3