[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34151] trunk/blender/source/blender: cmake: share the DNA_*.h list definition between makesrna and makesdna
Campbell Barton
ideasman42 at gmail.com
Fri Jan 7 12:08:48 CET 2011
Revision: 34151
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34151
Author: campbellbarton
Date: 2011-01-07 11:08:47 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
cmake: share the DNA_*.h list definition between makesrna and makesdna
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/CMakeLists.txt
trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
Modified: trunk/blender/source/blender/makesdna/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/CMakeLists.txt 2011-01-07 10:38:17 UTC (rev 34150)
+++ trunk/blender/source/blender/makesdna/CMakeLists.txt 2011-01-07 11:08:47 UTC (rev 34151)
@@ -24,4 +24,67 @@
#
# ***** 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)
Modified: trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/intern/CMakeLists.txt 2011-01-07 10:38:17 UTC (rev 34150)
+++ trunk/blender/source/blender/makesdna/intern/CMakeLists.txt 2011-01-07 11:08:47 UTC (rev 34151)
@@ -44,65 +44,7 @@
)
endif()
-set(SRC_DNA_INC
- ../DNA_ID.h
- ../DNA_action_types.h
- ../DNA_actuator_types.h
- ../DNA_anim_types.h
- ../DNA_armature_types.h
- ../DNA_boid_types.h
- ../DNA_brush_types.h
- ../DNA_camera_types.h
- ../DNA_cloth_types.h
- ../DNA_color_types.h
- ../DNA_constraint_types.h
- ../DNA_controller_types.h
- ../DNA_curve_types.h
- ../DNA_customdata_types.h
- ../DNA_documentation.h
- ../DNA_effect_types.h
- ../DNA_fileglobal_types.h
- ../DNA_genfile.h
- ../DNA_gpencil_types.h
- ../DNA_group_types.h
- ../DNA_image_types.h
- ../DNA_ipo_types.h
- ../DNA_key_types.h
- ../DNA_lamp_types.h
- ../DNA_lattice_types.h
- ../DNA_listBase.h
- ../DNA_material_types.h
- ../DNA_mesh_types.h
- ../DNA_meshdata_types.h
- ../DNA_meta_types.h
- ../DNA_modifier_types.h
- ../DNA_nla_types.h
- ../DNA_node_types.h
- ../DNA_object_fluidsim.h
- ../DNA_object_force.h
- ../DNA_object_types.h
- ../DNA_outliner_types.h
- ../DNA_packedFile_types.h
- ../DNA_particle_types.h
- ../DNA_property_types.h
- ../DNA_scene_types.h
- ../DNA_screen_types.h
- ../DNA_sdna_types.h
- ../DNA_sensor_types.h
- ../DNA_sequence_types.h
- ../DNA_smoke_types.h
- ../DNA_sound_types.h
- ../DNA_space_types.h
- ../DNA_text_types.h
- ../DNA_texture_types.h
- ../DNA_userdef_types.h
- ../DNA_vec_types.h
- ../DNA_vfont_types.h
- ../DNA_view2d_types.h
- ../DNA_view3d_types.h
- ../DNA_windowmanager_types.h
- ../DNA_world_types.h
-)
+# SRC_DNA_INC is defined in the parent dir
add_executable(makesdna ${SRC} ${SRC_DNA_INC})
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-01-07 10:38:17 UTC (rev 34150)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-01-07 11:08:47 UTC (rev 34151)
@@ -38,6 +38,12 @@
string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
set_source_files_properties(GENSRC PROPERTIES GENERATED true)
+set(SRC_RNA_INC
+ ../RNA_access.h
+ ../RNA_define.h
+ ../RNA_enum_types.h
+ ../RNA_types.h
+)
set(SRC
makesrna.c
@@ -48,27 +54,9 @@
../../../../intern/guardedalloc/intern/mmap_win.c
)
-blender_include_dirs(
- ../../../../intern/audaspace/intern
- ../../../../intern/guardedalloc
- ../../../../intern/memutil
- ..
- ../../makesdna
- ../../blenkernel
- ../../blenlib
- ../../blenfont
- ../../ikplugin
- ../../windowmanager
- ../../editors/include
- ../../gpu
- ../../imbuf
- ../../render/extern/include
- ../../../../extern/glew/include
- .
+set(INC
)
-file(GLOB INC_FILES ../*.h ../../makesdna/*.h)
-
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
@@ -137,7 +125,26 @@
endif()
# Build makesrna executable
-add_executable(makesrna ${SRC} ${INC_FILES})
+blender_include_dirs(
+ .
+ ..
+ ../../blenkernel
+ ../../blenlib
+ ../../blenfont
+ ../../gpu
+ ../../imbuf
+ ../../ikplugin
+ ../../makesdna
+ ../../windowmanager
+ ../../editors/include
+ ../../render/extern/include
+ ../../../../extern/glew/include
+ ../../../../intern/audaspace/intern
+ ../../../../intern/guardedalloc
+ ../../../../intern/memutil
+)
+
+add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
target_link_libraries(makesrna bf_dna)
# Output rna_*_gen.c
@@ -153,11 +160,7 @@
rna_access.c
${GENSRC}
- ../RNA_access.h
- ../RNA_define.h
- ../RNA_enum_types.h
- ../RNA_types.h
-
+ ${SRC_RNA_INC}
rna_internal.h
rna_internal_types.h
rna_nodetree_types.h
More information about the Bf-blender-cvs
mailing list