Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2010-12-06 10:56:37 +00:00
parent 357826aa6e
commit d64f46e0bb
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -992,7 +992,7 @@ ENDIF(WITH_CXX_GUARDEDALLOC)
#-----------------------------------------------------------------------------
# Libraries
FILE(WRITE ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "")
ADD_SUBDIRECTORY(source)
ADD_SUBDIRECTORY(intern)
ADD_SUBDIRECTORY(extern)

4
build_files/cmake/macros.cmake
View File

@@ -41,8 +41,8 @@ MACRO(BLENDERLIB
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)

14
source/blenderplayer/CMakeLists.txt
View File

@@ -51,12 +51,16 @@ ENDIF(WIN32 AND NOT UNIX)
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(UNIX)
)
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})

2
source/creator/CMakeLists.txt
View File

@@ -457,7 +457,7 @@ ENDIF(WITH_INSTALL)
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)