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

[Leif Andersen]

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

Log Message:
-----------
1.  Gtest is working again, and is back into the build.

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 21:44:26 UTC (rev 29347)
+++ branches/soc-2010-leifandersen/tests/CMakeLists.txt	2010-06-08 21:58:21 UTC (rev 29348)
@@ -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 21:44:26 UTC (rev 29347)
+++ branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt	2010-06-08 21:58:21 UTC (rev 29348)
@@ -121,7 +121,7 @@
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager blender_render)
 
 IF(WITH_ELBEEM)
 	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)