diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index acfcd820cc9..1540e54f694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 2cac2658104..cb201c53a22 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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) diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index f2b7b72ac9a..fa6521e7f8d 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -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}) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9a94b49c5c2..7b9d8421aa5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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) |