[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28813] branches/soc-2010-leifandersen/ tests/gtest: NOTE: This branch still won't compile.

Leif Andersen leif.a.andersen at gmail.com
Tue May 18 05:26:19 CEST 2010


Revision: 28813
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28813
Author:   leifandersen
Date:     2010-05-18 05:26:18 +0200 (Tue, 18 May 2010)

Log Message:
-----------
NOTE:  This branch still won't compile.  However, the source files for blender are now linking, unofortunently, the code is getting jumbled up in the linking somehow and is causing ~1300 errors.

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

Modified: branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt	2010-05-18 03:10:47 UTC (rev 28812)
+++ branches/soc-2010-leifandersen/tests/gtest/CMakeLists.txt	2010-05-18 03:26:18 UTC (rev 28813)
@@ -1,3 +1,5 @@
+CMAKE_POLICY(SET CMP0010 NEW)
+
 # For Google Test
 # Where gtest's .h files can be found.
 include_directories(
@@ -16,6 +18,9 @@
 #------------------------------------------
 
 #For Linking Blender's Libraries
+
+SETUP_LIBDIRS()
+
 FILE(GLOB SRC *.c*)
 
 SET(INC 
@@ -46,10 +51,205 @@
 	${ZLIB_INC}
 )
 
-BLENDERLIB(bf_python_tests "${SRC}" "${INC}")
+BLENDERLIB(bf_blenkernel_tests "${SRC}" "${INC}")
 
+
 SETUP_LIBLINKS(firsttest)
 #------------------------
 # Other tests I'm doing
+
+INCLUDE_DIRECTORIES(
+	${Blender_SOURCE_DIR}/intern/guardedalloc
+	${Blender_SOURCE_DIR}/source/blender/blenlib
+	${Blender_SOURCE_DIR}/source/blender/blenkernel
+	${Blender_SOURCE_DIR}/source/blender/editors/include
+	${Blender_SOURCE_DIR}/source/blender/makesrna
+	${Blender_SOURCE_DIR}/source/blender/makesrna/intern
+	${Blender_SOURCE_DIR}/source/blender/nodes
+	${Blender_SOURCE_DIR}/source/blender/include
+	${Blender_SOURCE_DIR}/source/blender/blenloader
+	${Blender_SOURCE_DIR}/source/blender/imbuf
+	${Blender_SOURCE_DIR}/source/blender/renderconverter
+	${Blender_SOURCE_DIR}/source/blender/render/extern/include
+	${Blender_SOURCE_DIR}/source/blender/makesdna
+	${Blender_SOURCE_DIR}/source/blender/gpu
+	${Blender_SOURCE_DIR}/source/blender/windowmanager
+	${Blender_SOURCE_DIR}/source/kernel/gen_messaging
+	${Blender_SOURCE_DIR}/source/kernel/gen_system
+	${Blender_SOURCE_DIR}/extern/glew/include
+)
+
+IF(WIN32)
+	INCLUDE_DIRECTORIES(${PTHREADS_INC})
+ENDIF(WIN32)
+
+IF(WITH_QUICKTIME)
+	ADD_DEFINITIONS(-DWITH_QUICKTIME)
+ENDIF(WITH_QUICKTIME)
+
+IF(WITH_OPENEXR)
+	ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_PYTHON)
+	INCLUDE_DIRECTORIES(../blender/python)
+ELSE(WITH_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
+
+IF(NOT WITH_SDL)
+	ADD_DEFINITIONS(-DDISABLE_SDL)
+ENDIF(NOT WITH_SDL)
+
+IF(UNIX AND NOT APPLE)
+	SET(BLENDERPATH ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
+	# blender_path in creator.c
+	ADD_DEFINITIONS(-DBLENDERPATH="${BLENDERPATH}")
+ENDIF(UNIX AND NOT APPLE)
+
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	ADD_DEFINITIONS(-DWITH_BINRELOC)
+	INCLUDE_DIRECTORIES(${BINRELOC_INC})
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+# Setup the exe sources and buildinfo
+SET(EXESRC creator.c)
+
+IF(WIN32)
+	SET(EXESRC ${EXESRC} ../icons/winblender.rc)
+ENDIF(WIN32)
+
+IF(WITH_BUILDINFO)
+	ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}")
+	ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}")
+	ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}")
+	ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}")
+	ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
+	
+	SET(EXESRC ${EXESRC} buildinfo.c)
+ENDIF(WITH_BUILDINFO)
+
+MESSAGE(STATUS "Configuring secondtest")
+
 add_executable(secondtest secondtest.c)
+
+ADD_DEPENDENCIES(secondtest blender makesdna)
+
+TARGET_LINK_LIBRARIES(secondtest ${BLENDER_SORTED_LIBS})
+
+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)
+
+IF(WITH_ELBEEM)
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+ENDIF(WITH_ELBEEM)
+
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+
+#IF(UNIX)
+	# Sort libraries
+	SET(BLENDER_SORTED_LIBS
+		bf_windowmanager
+		bf_editors
+		blender_BSP 
+		bf_ghost 
+		bf_string 
+		blender_render 
+		blender_ONL 
+		bf_python 
+		bf_gen_python 
+		bf_ikplugin
+		bf_modifiers
+		bf_blenkernel
+		bf_nodes
+		bf_gpu
+		bf_blenloader
+		bf_blenpluginapi 
+		bf_imbuf 
+		bf_blenlib 
+		bf_avi 
+		bf_cineon 
+		bf_openexr 
+		bf_dds
+		bf_readblenfile
+		bf_collada
+		blender_BSP 
+		blender_bop 
+		bf_kernel 
+		bf_decimation 
+		bf_elbeem 
+		bf_IK 
+		bf_memutil 
+		bf_guardedalloc 
+		blender_CTR 
+		bf_moto 
+		bf_windowmanager
+		bf_editors
+		bf_blroutines 
+		bf_converter 
+		bf_dummy 
+		bf_bullet 
+		bf_smoke
+		bf_minilzo
+		bf_lzma
+		bf_common 
+		bf_ketsji 
+		bf_logic 
+		bf_rasterizer 
+		bf_oglrasterizer 
+		bf_expressions 
+		bf_scenegraph 
+		bf_moto 
+		bf_blroutines 
+		kx_network 
+		bf_kernel 
+		bf_ngnetwork 
+		extern_bullet 
+		bf_loopbacknetwork 
+		bf_ITASC
+		bf_common 
+		bf_moto 
+		bf_python
+		bf_gen_python
+		extern_binreloc
+		extern_glew
+		extern_libopenjpeg
+		bf_videotex
+		bf_rna
+		bf_dna
+		bf_blenfont
+		bf_audaspace
+		bf_decimation
+	)
+
+	IF(WITH_CXX_GUARDEDALLOC)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
+	ENDIF(WITH_CXX_GUARDEDALLOC)
+
+	IF(WITH_QUICKTIME)
+		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+	ENDIF(WITH_QUICKTIME)
+
+
+	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
+		SET(REMLIB ${SORTLIB})
+		FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
+			IF(${SEARCHLIB} STREQUAL ${SORTLIB})
+				SET(REMLIB "")
+			ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB})
+		ENDFOREACH(SEARCHLIB)
+		IF(REMLIB)
+			MESSAGE(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+			LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+		ENDIF(REMLIB)
+	ENDFOREACH(SORTLIB)
+	TARGET_LINK_LIBRARIES(secondtest ${BLENDER_SORTED_LIBS})
+#ELSE(UNIX)
+#	TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
+#ENDIF(UNIX)
+
 SETUP_LIBLINKS(secondtest)

Modified: branches/soc-2010-leifandersen/tests/gtest/firsttest.cpp
===================================================================
--- branches/soc-2010-leifandersen/tests/gtest/firsttest.cpp	2010-05-18 03:10:47 UTC (rev 28812)
+++ branches/soc-2010-leifandersen/tests/gtest/firsttest.cpp	2010-05-18 03:26:18 UTC (rev 28813)
@@ -21,7 +21,7 @@
   FooTest() {
     // You can do set-up work for each test here.
 	  EditMesh bob;
-	  BME_editmesh_to_bmesh(&bob);	  
+	  //BME_editmesh_to_bmesh(&bob);	  
   }
 
   virtual ~FooTest() {





More information about the Bf-blender-cvs mailing list