[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33504] trunk/blender: CMake: use a global list to store libraries built rather then cmake_blender_libs. txt file.

[Campbell Barton]

Revision: 33504
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33504
Author:   campbellbarton
Date:     2010-12-06 11:56:37 +0100 (Mon, 06 Dec 2010)

Log Message:
-----------
CMake: use a global list to store libraries built rather then cmake_blender_libs.txt file.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-12-06 10:36:19 UTC (rev 33503)
+++ trunk/blender/CMakeLists.txt	2010-12-06 10:56:37 UTC (rev 33504)
@@ -992,7 +992,7 @@
 
 #-----------------------------------------------------------------------------
 # Libraries
-FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
+
 ADD_SUBDIRECTORY(source)
 ADD_SUBDIRECTORY(intern)
 ADD_SUBDIRECTORY(extern)

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2010-12-06 10:36:19 UTC (rev 33503)
+++ trunk/blender/build_files/cmake/macros.cmake	2010-12-06 10:56:37 UTC (rev 33504)
@@ -41,8 +41,8 @@
 
 	BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
 
-	# Add to blender's list of libraries
-	FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
+	SET_PROPERTY(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
+
 ENDMACRO(BLENDERLIB)
 
 MACRO(SETUP_LIBDIRS)

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2010-12-06 10:36:19 UTC (rev 33503)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2010-12-06 10:56:37 UTC (rev 33504)
@@ -51,12 +51,16 @@
 
 ADD_DEPENDENCIES(blenderplayer makesdna)
 
-FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
+GET_PROPERTY(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} ge_player_common ge_player_ghost blenkernel_blc)
+LIST(APPEND BLENDER_LINK_LIBS
+	ge_player_common
+	ge_player_ghost
+	blenkernel_blc
+)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
+	LIST(APPEND BLENDER_LINK_LIBS extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(UNIX)
@@ -120,11 +124,11 @@
 	)
   
 	IF(WITH_CODEC_QUICKTIME)
-		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+		LIST(APPEND BLENDER_SORTED_LIBS bf_quicktime)
 	ENDIF(WITH_CODEC_QUICKTIME)
 
 	IF(WITH_CXX_GUARDEDALLOC)
-		SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
+		LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
 	ENDIF(WITH_CXX_GUARDEDALLOC)
 
 	FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-12-06 10:36:19 UTC (rev 33503)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-12-06 10:56:37 UTC (rev 33504)
@@ -457,7 +457,7 @@
 
 ADD_DEPENDENCIES(blender makesdna)
 
-FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
+GET_PROPERTY(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
 SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)