[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29345] branches/soc-2010-leifandersen/ tests: 1.

[Leif Andersen]

Revision: 29345
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29345
Author:   leifandersen
Date:     2010-06-08 19:10:52 +0200 (Tue, 08 Jun 2010)

Log Message:
-----------
1.  The change in blender's linking caused GTest to brake, small attempt made to fix it, eventually just disabled it, compiles again.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/tests/CMakeLists.txt
    branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt

Modified: branches/soc-2010-leifandersen/tests/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/CMakeLists.txt	2010-06-08 15:39:22 UTC (rev 29344)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt	2010-06-08 17:10:52 UTC (rev 29345)
@@ -24,5 +24,5 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 ENABLE_TESTING()
-ADD_SUBDIRECTORY(gtest)
+#ADD_SUBDIRECTORY(gtest)
 ADD_SUBDIRECTORY(pyunit)

Modified: branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt	2010-06-08 15:39:22 UTC (rev 29344)
+++ branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt	2010-06-08 17:10:52 UTC (rev 29345)
@@ -136,7 +136,45 @@
 	# Sort libraries
 	SET(BLENDER_SORTED_LIBS
 		bf_windowmanager
-		bf_editors
+
+        bf_editor_space_api
+        bf_editor_space_action
+        bf_editor_space_buttons
+        bf_editor_space_console
+        bf_editor_space_file
+        bf_editor_space_graph
+        bf_editor_space_image
+        bf_editor_space_info
+        bf_editor_space_logic
+        bf_editor_space_nla
+        bf_editor_space_node
+        bf_editor_space_outliner
+        bf_editor_space_script
+        bf_editor_space_sequencer
+        bf_editor_space_sound
+        bf_editor_space_time
+        bf_editor_space_userpref
+        bf_editor_space_view3d
+
+        bf_editor_text
+        bf_editor_transform
+        bf_editor_util
+        bf_editor_uvedit
+        bf_editor_curve
+        bf_editor_armature
+        bf_editor_gpencil
+        bf_editor_interface
+        bf_editor_mesh
+        bf_editor_metaball
+        bf_editor_object
+        bf_editor_physics
+        bf_editor_render
+        bf_editor_screen
+        bf_editor_sculpt_paint
+        bf_editor_sound
+        bf_editor_animation
+        bf_editor_datafiles
+
 		blender_BSP 
 		bf_ghost 
 		bf_string 
@@ -206,6 +244,7 @@
 		bf_blenfont
 		bf_audaspace
 		bf_decimation
+
 	)
 
 	IF(WITH_CXX_GUARDEDALLOC)
@@ -231,7 +270,7 @@
 	ENDFOREACH(SORTLIB)
 	TARGET_LINK_LIBRARIES(blendertests ${BLENDER_SORTED_LIBS})
 #ELSE(UNIX)
-#	TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
+#	TARGET_LINK_LIBRARIES(blendertests ${BLENDER_LINK_LIBS})
 #ENDIF(UNIX)
 
 SETUP_LIBLINKS(blendertests)