[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35054] trunk/blender: cmake was using dna source list with the variable out of scope, possibly causing dependency problems.

Campbell Barton ideasman42 at gmail.com
Tue Feb 22 07:23:07 CET 2011 

Revision: 35054
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35054
Author:   campbellbarton
Date:     2011-02-22 06:23:07 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
cmake was using dna source list with the variable out of scope, possibly causing dependency problems.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/packaging.cmake
    trunk/blender/source/blender/CMakeLists.txt
    trunk/blender/source/blender/makesdna/CMakeLists.txt
    trunk/blender/source/blender/makesdna/intern/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-02-22 06:05:08 UTC (rev 35053)
+++ trunk/blender/CMakeLists.txt	2011-02-22 06:23:07 UTC (rev 35054)
@@ -161,9 +161,17 @@
 
 TEST_SSE_SUPPORT()
 
+#-----------------------------------------------------------------------------
+# Initialize un-cached vars, avoid unused warning
+
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
+# these are added to later on.
+set(C_WARNINGS "")
+set(CXX_WARNINGS "")
+
+
 # disabled for now, not supported
 # option(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 

Modified: trunk/blender/build_files/cmake/packaging.cmake
===================================================================
--- trunk/blender/build_files/cmake/packaging.cmake	2011-02-22 06:05:08 UTC (rev 35053)
+++ trunk/blender/build_files/cmake/packaging.cmake	2011-02-22 06:23:07 UTC (rev 35054)
@@ -5,7 +5,7 @@
 set(ORG_WEBSITE          "www.blender.org")
 
 set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
-set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_NAME_LONG})
+set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
 set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR})
 set(CPACK_PACKAGE_CONTACT ${PROJECT_CONTACT})
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")

Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt	2011-02-22 06:05:08 UTC (rev 35053)
+++ trunk/blender/source/blender/CMakeLists.txt	2011-02-22 06:23:07 UTC (rev 35054)
@@ -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)

Modified: trunk/blender/source/blender/makesdna/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/CMakeLists.txt	2011-02-22 06:05:08 UTC (rev 35053)
+++ trunk/blender/source/blender/makesdna/CMakeLists.txt	2011-02-22 06:23:07 UTC (rev 35054)
@@ -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)

Modified: trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/intern/CMakeLists.txt	2011-02-22 06:05:08 UTC (rev 35053)
+++ trunk/blender/source/blender/makesdna/intern/CMakeLists.txt	2011-02-22 06:23:07 UTC (rev 35054)
@@ -57,6 +57,9 @@
 )
 
 # Build bf_dna library
+set(INC
+)
+
 set(SRC
 	dna_genfile.c
 	dna.c

More information about the Bf-blender-cvs mailing list