mostly building (except for cycles/cuda)

CMakeLists.txt

@@ -2326,6 +2326,7 @@ if(WITH_IMAGE_OPENJPEG)
 	else()
 		set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
 		set(OPENJPEG_DEFINES "-DOPJ_STATIC")
+		set(OPENJPEG_LIBRARIES "extern_openjpeg")
 	endif()
 	# Special handling of Windows platform where openjpeg is always static.
 	if(WIN32)
@@ -2333,6 +2334,12 @@ if(WITH_IMAGE_OPENJPEG)
 	endif()
 endif()
 
+if(WITH_LZO)
+	if(NOT WITH_SYSTEM_LZO)
+		set(LZO_LIBRARIES "extern_minilzo")
+	endif()
+endif()
+
 if(WITH_IMAGE_REDCODE)
 	set(REDCODE ${CMAKE_SOURCE_DIR}/extern)
 	set(REDCODE_INC ${REDCODE})

build_files/cmake/macros.cmake

@@ -212,6 +212,8 @@ function(blender_add_lib_nolist
 
 	add_library(${name} ${sources})
 
+	target_link_libraries(${name} ${lib_depends})
+
 	# works fine without having the includes
 	# listed is helpful for IDE's (QtCreator/MSVC)
 	blender_source_group("${sources}")
@@ -229,10 +231,13 @@ function(blender_add_lib
 	sources
 	includes
 	includes_sys
+	libs
 	)
 
 	blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
 
+	target_link_libraries(${name} "${libs}")
+
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()
 
@@ -469,7 +474,8 @@ endfunction()
 
 function(SETUP_BLENDER_SORTED_LIBS)
 
-	get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+	# get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+	set(BLENDER_LINK_LIBS)
 
 	list(APPEND BLENDER_LINK_LIBS
 		bf_windowmanager

extern/Eigen3/CMakeLists.txt

@@ -40,4 +40,8 @@ set(SRC
 	intern/svd.h
 )
 
-blender_add_lib(extern_eigen3 "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+
+)
+
+blender_add_lib(extern_eigen3 "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/binreloc/CMakeLists.txt

@@ -32,7 +32,11 @@ set(SRC
 	include/binreloc.h
 )
 
+set(LIB
+
+)
+
 add_definitions(-DENABLE_BINRELOC)
 
 
-blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/bullet2/CMakeLists.txt

@@ -403,4 +403,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/carve/CMakeLists.txt

@@ -169,4 +169,4 @@ if(WITH_BOOST)
 	)
 endif()
 
-blender_add_lib(extern_carve "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_carve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/clew/CMakeLists.txt

@@ -37,6 +37,10 @@ set(SRC
 	src/clew.c
 )
 
+set(LIB
+
+)
+
 add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
 
-blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/colamd/CMakeLists.txt

@@ -38,4 +38,4 @@ set(SRC
 	Include/UFconfig.h
 )
 
-blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/cuew/CMakeLists.txt

@@ -37,4 +37,8 @@ set(SRC
 	src/cuew.c
 )
 
-blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+
+)
+
+blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/glew-es/CMakeLists.txt

@@ -47,6 +47,10 @@ set(SRC
 	include/GL/wglew.h
 )
 
+set(LIB
+
+)
+
 add_definitions(${GL_DEFINITIONS})
 
 if(WITH_GLEW_MX)
@@ -54,4 +58,4 @@ if(WITH_GLEW_MX)
 endif()
 
 
-blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/glew/CMakeLists.txt

@@ -51,4 +51,4 @@ if(WITH_GLEW_MX)
 	add_definitions(-DGLEW_MX)
 endif()
 
-blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/gtest/CMakeLists.txt

@@ -69,4 +69,8 @@ set(SRC
 	include/gtest/internal/gtest-type-util.h
 )
 
-blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+
+)
+
+blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/libmv/CMakeLists.txt

@@ -72,6 +72,11 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 	)
 endif()
 
+set(LIB
+	extern_ceres
+	extern_glog
+)
+
 if(WITH_LIBMV)
 	TEST_SHARED_PTR_SUPPORT()
 	if(SHARED_PTR_FOUND)
@@ -219,7 +224,7 @@ if(WITH_LIBMV)
 
 
 	if(WITH_GTESTS)
-		blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "")
+		blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "")
 
 		BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres")
 		BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres")
@@ -259,7 +264,8 @@ else()
 	)
 endif()
 
-blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+unset(LIB)
 
 if(WITH_LIBMV)
 	add_subdirectory(third_party)
@@ -345,5 +351,5 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 		)
 	endif()
 
-	blender_add_lib(extern_glog "${GLOG_SRC}" "${INC}" "${INC_SYS}")
+	blender_add_lib(extern_glog "${GLOG_SRC}" "${INC}" "${INC_SYS}" "")
 endif()

extern/libmv/third_party/ceres/CMakeLists.txt

@@ -356,4 +356,4 @@ else()
 	endif()
 endif()
 
-blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/libopenjpeg/CMakeLists.txt

@@ -86,4 +86,4 @@ set(SRC
 	opj_config.h
 )
 
-blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/libredcode/CMakeLists.txt

@@ -43,4 +43,4 @@ set(SRC
 
 add_definitions(${OPENJPEG_DEFINES})
 
-blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/lzma/CMakeLists.txt

@@ -47,4 +47,4 @@ set(SRC
 	Types.h
 )
 
-blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/lzo/CMakeLists.txt

@@ -41,4 +41,4 @@ set(SRC
 	minilzo/minilzo.h
 )
 
-blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/rangetree/CMakeLists.txt

@@ -27,5 +27,5 @@ set(SRC
 	range_tree_c_api.cc
 )
 
-blender_add_lib(extern_rangetree "${SRC}" "${INC}" "")
+blender_add_lib(extern_rangetree "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 

extern/recastnavigation/CMakeLists.txt

@@ -67,4 +67,4 @@ set(SRC
 		Recast/Include/RecastAssert.h
 )
 
-blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/sdlew/CMakeLists.txt

@@ -37,4 +37,8 @@ set(SRC
 	src/sdlew.c
 )
 
-blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+
+)
+
+blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/wcwidth/CMakeLists.txt

@@ -37,4 +37,8 @@ set(SRC
 	wcwidth.h
 )
 
-blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+
+)
+
+blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/xdnd/CMakeLists.txt

@@ -40,4 +40,4 @@ add_definitions(
 	-DHAVE_SYS_TIME_H
 )
 
-blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/audaspace/CMakeLists.txt

@@ -353,4 +353,4 @@ if(WITH_PYTHON)
 endif()
 endif()
 
-blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/container/CMakeLists.txt

@@ -38,4 +38,4 @@ set(SRC
 )
 
 # infact nothing to compile!
-blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/cycles/blender/CMakeLists.txt

@@ -40,6 +40,15 @@ set(SRC
 	blender_util.h
 )
 
+set(LIB
+	cycles_bvh
+	cycles_device
+	cycles_kernel
+	cycles_render
+	cycles_subd
+	cycles_util
+)
+
 set(ADDON_FILES
 	addon/__init__.py
 	addon/engine.py 
@@ -52,7 +61,7 @@ set(ADDON_FILES
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # avoid link failure with clang 3.4 debug
 if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')

intern/dualcon/CMakeLists.txt

@@ -45,5 +45,5 @@ set(SRC
 	dualcon.h
 )
 
-blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 

intern/ghost/CMakeLists.txt

@@ -88,6 +88,11 @@ set(SRC
 	intern/GHOST_WindowManager.h
 )
 
+set(LIB
+	bf_intern_string
+	bf_intern_glew_mx
+)
+
 if(WITH_GHOST_DEBUG)
 	list(APPEND SRC
 		intern/GHOST_EventPrinter.cpp
@@ -207,6 +212,10 @@ elseif(WITH_X11)
 
 			intern/GHOST_DropTargetX11.h
 		)
+
+		list(APPEND LIB
+			extern_xdnd
+		)
 	endif()
 
 	if(X11_XF86keysym_INCLUDE_PATH)
@@ -332,4 +341,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/ghost/test/CMakeLists.txt

@@ -18,6 +18,7 @@ macro(blender_add_lib
 	sources
 	includes
 	includes_sys
+	libs
 	)
 
 endmacro()

intern/glew-mx/CMakeLists.txt

@@ -39,6 +39,10 @@ set(SRC
 	intern/symbol-binding.h
 )
 
+set(LIB
+
+)
+
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/guardedalloc/CMakeLists.txt

@@ -44,6 +44,10 @@ set(SRC
 	../atomic/atomic_ops.h
 )
 
+set(LIB
+
+)
+
 if(WIN32 AND NOT UNIX)
 	list(APPEND SRC
 		intern/mmap_win.c
@@ -52,12 +56,12 @@ if(WIN32 AND NOT UNIX)
 	)
 endif()
 
-blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # Override C++ alloc, optional.
 if(WITH_CXX_GUARDEDALLOC)
 	set(SRC
 		cpp/mallocn.cpp
 	)
-	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}")
+	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 endif()

intern/iksolver/CMakeLists.txt

@@ -72,4 +72,8 @@ set(SRC
 	intern/TNT/version.h
 )
 
-blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+	bf_intern_moto
+)
+
+blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/itasc/CMakeLists.txt

@@ -360,4 +360,4 @@ set(SRC
 
 unset(EIGEN3_HEADERS)
 
-blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/locale/CMakeLists.txt

@@ -59,7 +59,7 @@ if(WITH_INTERNATIONAL)
 	add_definitions(${BOOST_DEFINITIONS})
 endif()
 
-blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # -----------------------------------------------------------------------------
 # Build msgfmt executable

intern/memutil/CMakeLists.txt

@@ -46,4 +46,4 @@ set(SRC
 	MEM_SmartPtr.h
 )
 
-blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/mikktspace/CMakeLists.txt

@@ -37,5 +37,5 @@ set(SRC
 	mikktspace.h
 )
 
-blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 

intern/moto/CMakeLists.txt

@@ -80,4 +80,4 @@ set(SRC
 	include/MT_Vector4.inl
 )
 
-blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/opencolorio/CMakeLists.txt

@@ -69,4 +69,4 @@ if(WITH_OPENCOLORIO)
 endif()
 
 
-blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/opennl/CMakeLists.txt

@@ -90,4 +90,8 @@ set(SRC
 	superlu/util.h
 )
 
-blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+	extern_colamd
+)
+
+blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/opensubdiv/CMakeLists.txt

@@ -49,6 +49,10 @@ set(SRC
 	opensubdiv_intern.h
 )
 
+set(LIB
+
+)
+
 if(WITH_SUBSURF_WERROR)
 	ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WERROR -Werror)
 	ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS C_WERROR -Werror)
@@ -91,4 +95,6 @@ if(OPENSUBDIV_HAS_OPENCL)
 	add_definitions(-DOPENSUBDIV_HAS_CLEW)
 endif()
 
-blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}")
+
+
+blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/raskter/CMakeLists.txt

@@ -37,4 +37,4 @@ set(SRC
 	raskter.h
 )
 
-blender_add_lib(bf_intern_raskter "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_raskter "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/rigidbody/CMakeLists.txt

@@ -35,4 +35,8 @@ set(SRC
 	RBI_api.h
 )
 
-blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+	extern_bullet
+)
+
+blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/smoke/CMakeLists.txt

@@ -100,5 +100,5 @@ if(WITH_FFTW3)
 	)
 endif()
 
-blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 

intern/string/CMakeLists.txt

@@ -38,4 +38,4 @@ set(SRC
 	STR_String.h
 )
 
-blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

intern/utfconv/CMakeLists.txt

@@ -40,4 +40,4 @@ if(WIN32)
 	)
 endif()
 
-blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/avi/CMakeLists.txt

@@ -50,4 +50,4 @@ set(SRC
 	intern/avi_rgb32.h
 )
 
-blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blenfont/CMakeLists.txt

@@ -73,4 +73,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blenkernel/CMakeLists.txt

@@ -296,10 +296,36 @@ set(SRC
 	intern/data_transfer_intern.h
 )
 
+set(LIB
+	extern_libmv
+	bf_intern_mikktspace
+	bf_intern_raskter
+	bf_blenlib
+	bf_bmesh
+	bf_blenfont
+	bf_blentranslation
+	bf_blenloader
+	bf_depsgraph
+	bf_ikplugin
+	bf_gpu
+	bf_imbuf
+	bf_nodes
+	bf_modifiers
+	bf_rna
+	bf_python
+	bf_python_bmesh
+)
+
+
 if(WITH_BINRELOC)
 	list(APPEND INC_SYS
 		${BINRELOC_INCLUDE_DIRS}
 	)
+
+	list(APPEND LIB
+		extern_binreloc
+	)
+
 	add_definitions(-DWITH_BINRELOC)
 endif()
 
@@ -317,6 +343,10 @@ if(WITH_AUDASPACE)
 	list(APPEND INC_SYS
 		${AUDASPACE_C_INCLUDE_DIRS}
 	)
+
+	list(APPEND LIB
+		bf_intern_audaspace
+	)
 endif()
 
 if(WITH_BULLET)
@@ -326,6 +356,10 @@ if(WITH_BULLET)
 	list(APPEND INC
 		../../../intern/rigidbody
 	)
+	list(APPEND LIB
+		extern_bullet
+		bf_intern_rigidbody
+	)
 	add_definitions(-DWITH_BULLET)
 endif()
 
@@ -373,6 +407,9 @@ if(WITH_CODEC_AVI)
 	list(APPEND INC
 		../avi
 	)
+	list(APPEND LIB
+		bf_avi
+	)
 	add_definitions(-DWITH_AVI)
 endif()
 
@@ -445,6 +482,9 @@ if(WITH_LZO)
 			../../../extern/lzo/minilzo
 		)
 	endif()
+	list(APPEND LIB
+		${LZO_LIBRARIES}
+	)
 	add_definitions(-DWITH_LZO)
 endif()
 
@@ -452,6 +492,9 @@ if(WITH_LZMA)
 	list(APPEND INC_SYS
 		../../../extern/lzma
 	)
+	list(APPEND LIB
+		extern_lzma
+	)
 	add_definitions(-DWITH_LZMA)
 endif()
 
@@ -516,6 +559,9 @@ if(WITH_OPENSUBDIV)
 			                            PROPERTIES COMPILE_FLAGS -Werror)
 		endif()
 	endif()
+	list(APPEND LIB
+		bf_intern_opensubdiv
+	)
 endif()
 
 ## Warnings as errors, this is too strict!
@@ -527,4 +573,4 @@ if(WITH_LEGACY_DEPSGRAPH)
 	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
 endif()
 
-blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blenlib/CMakeLists.txt

@@ -204,6 +204,12 @@ set(SRC
 	PIL_time_utildefines.h
 )
 
+set(LIB
+	bf_intern_guardedalloc
+	extern_wcwidth
+	extern_eigen3
+)
+
 if(WITH_MEM_VALGRIND)
 	add_definitions(-DWITH_MEM_VALGRIND)
 endif()
@@ -225,4 +231,4 @@ set_source_files_properties(
 	PROPERTIES HEADER_FILE_ONLY TRUE
 )
 
-blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blenloader/CMakeLists.txt

@@ -61,6 +61,10 @@ set(SRC
 	intern/readfile.h
 )
 
+set(LIB
+	bf_dna
+)
+
 if(WITH_BUILDINFO)
 	add_definitions(-DWITH_BUILDINFO)
 endif()
@@ -73,4 +77,4 @@ if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
-blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/blentranslation/CMakeLists.txt

@@ -42,7 +42,14 @@ set(SRC
 	BLT_translation.h
 )
 
+set(LIB
+
+)
+
 if(WITH_INTERNATIONAL)
+	list(APPEND LIB
+		bf_intern_locale
+	)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
@@ -53,4 +60,4 @@ if(WITH_PYTHON)
 	)
 endif()
 
-blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/bmesh/CMakeLists.txt

@@ -159,6 +159,11 @@ set(SRC
 	bmesh_tools.h
 )
 
+set(LIB
+	bf_blenlib
+	extern_rangetree
+)
+
 if(MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
@@ -185,4 +190,4 @@ if(WITH_FREESTYLE)
 	add_definitions(-DWITH_FREESTYLE)
 endif()
 
-blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/collada/CMakeLists.txt

@@ -116,4 +116,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/compositor/CMakeLists.txt

@@ -537,6 +537,12 @@ set(SRC
 	operations/COM_MaskOperation.h
 )
 
+set(LIB
+	extern_clew
+	bf_blenlib
+	bf_imbuf_openexr
+)
+
 list(APPEND INC
 	${CMAKE_CURRENT_BINARY_DIR}/operations
 )
@@ -555,4 +561,4 @@ if(WITH_CYCLES AND WITH_CYCLES_DEBUG)
 	add_definitions(-DWITH_CYCLES_DEBUG)
 endif()
 
-blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/depsgraph/CMakeLists.txt

@@ -119,4 +119,4 @@ if(WITH_OPENSUBDIV)
 	add_definitions(-DWITH_OPENSUBDIV)
 endif()
 
-blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/animation/CMakeLists.txt

@@ -55,10 +55,14 @@ set(SRC
 	anim_intern.h
 )
 
+set(LIB
+
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/armature/CMakeLists.txt

@@ -64,6 +64,10 @@ set(SRC
 	reeb.h
 )
 
+set(LIB
+	bf_blenlib
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
@@ -77,4 +81,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/curve/CMakeLists.txt

@@ -47,4 +47,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/datafiles/CMakeLists.txt

@@ -130,4 +130,4 @@ if(WITH_BLENDER)
 	data_to_c_simple(../../../../release/datafiles/startup.blend SRC)
 endif()
 
-blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/gpencil/CMakeLists.txt

@@ -58,4 +58,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/interface/CMakeLists.txt

@@ -61,6 +61,14 @@ set(SRC
 	interface_intern.h
 )
 
+set(LIB
+	bf_editor_datafiles
+	bf_editor_space_clip
+	bf_editor_space_file
+	bf_editor_space_image
+	bf_blenlib
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
@@ -81,4 +89,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/io/CMakeLists.txt

@@ -42,7 +42,15 @@ set(SRC
 	io_ops.h
 )
 
+set(LIB
+
+)
+
 if(WITH_OPENCOLLADA)
+	list(APPEND LIB
+		bf_collada
+	)
+
 	add_definitions(-DWITH_COLLADA)
 endif()
 
@@ -50,4 +58,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/mask/CMakeLists.txt

@@ -50,6 +50,11 @@ set(SRC
 	mask_intern.h
 )
 
+set(LIB
+	bf_editor_space_sequencer
+	bf_blenkernel
+)
+
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_mask "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_mask "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/mesh/CMakeLists.txt

@@ -63,6 +63,11 @@ set(SRC
 	mesh_intern.h
 )
 
+set(LIB
+
+)
+
+
 if(WITH_GAMEENGINE)
 	add_definitions(-DWITH_GAMEENGINE)
 
@@ -89,4 +94,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/metaball/CMakeLists.txt

@@ -40,4 +40,4 @@ set(SRC
 	mball_intern.h
 )
 
-blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/object/CMakeLists.txt

@@ -66,6 +66,14 @@ set(SRC
 
 add_definitions(${GL_DEFINITIONS})
 
+set(LIB
+	bf_editor_armature
+	bf_editor_curve
+	bf_editor_physics
+	bf_render
+	bf_blenkernel
+)
+
 if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
@@ -78,4 +86,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/physics/CMakeLists.txt

@@ -51,7 +51,15 @@ set(SRC
 	physics_intern.h
 )
 
+set(LIB
+
+)
+
+
 if(WITH_MOD_FLUID)
+	list(APPEND LIB
+		bf_intern_elbeem
+	)
 	add_definitions(-DWITH_MOD_FLUID)
 endif()
 
@@ -68,4 +76,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/render/CMakeLists.txt

@@ -51,6 +51,10 @@ set(SRC
 	render_intern.h
 )
 
+set(LIB
+
+)
+
 if(WITH_CODEC_QUICKTIME)
 	list(APPEND INC
 		../../quicktime
@@ -63,6 +67,10 @@ endif()
 
 if(WITH_HEADLESS)
 	add_definitions(-DWITH_HEADLESS)
+else()
+	list(APPEND LIB
+		bf_editor_datafiles
+	)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
@@ -78,4 +86,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/screen/CMakeLists.txt

@@ -49,10 +49,14 @@ set(SRC
 	screen_intern.h
 )
 
+set(LIB
+	bf_editor_object
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/sculpt_paint/CMakeLists.txt

@@ -67,4 +67,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/sound/CMakeLists.txt

@@ -54,4 +54,4 @@ if(WITH_CODEC_SNDFILE)
 	add_definitions(-DWITH_SNDFILE)
 endif()
 
-blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_action/CMakeLists.txt

@@ -46,6 +46,11 @@ set(SRC
 	action_intern.h
 )
 
+set(LIB
+	bf_editor_gpencil
+	bf_editor_mask
+)
+
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_api/CMakeLists.txt

@@ -37,4 +37,27 @@ set(SRC
 	spacetypes.c
 )
 
-blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}")
+set(LIB
+	bf_editor_io
+	bf_editor_sound
+	bf_editor_space_action
+	bf_editor_space_buttons
+	bf_editor_space_clip
+	bf_editor_space_console
+	bf_editor_space_file
+	bf_editor_space_graph
+	bf_editor_space_image
+	bf_editor_space_info
+	bf_editor_space_logic
+	bf_editor_space_nla
+	bf_editor_space_node
+	bf_editor_space_outliner
+	bf_editor_space_script
+	bf_editor_space_sequencer
+	bf_editor_space_text
+	bf_editor_space_time
+	bf_editor_space_userpref
+	bf_editor_space_view3d
+)
+
+blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_buttons/CMakeLists.txt

@@ -54,4 +54,4 @@ if(WITH_FREESTYLE)
 	add_definitions(-DWITH_FREESTYLE)
 endif()
 
-blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_clip/CMakeLists.txt

@@ -58,10 +58,15 @@ set(SRC
 	clip_intern.h
 )
 
+set(LIB
+	bf_editor_mask
+	bf_editor_uvedit
+)
+
 add_definitions(${GL_DEFINITIONS})
 
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_console/CMakeLists.txt

@@ -49,4 +49,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_file/CMakeLists.txt

@@ -55,6 +55,10 @@ set(SRC
 	fsmenu.h
 )
 
+set(LIB
+	bf_editor_datafiles
+)
+
 if(WITH_HEADLESS)
 	add_definitions(-DWITH_HEADLESS)
 endif()
@@ -97,4 +101,4 @@ if(WITH_FREESTYLE)
 	add_definitions(-DWITH_FREESTYLE)
 endif()
 
-blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_graph/CMakeLists.txt

@@ -61,4 +61,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_image/CMakeLists.txt

@@ -49,6 +49,11 @@ set(SRC
 	image_intern.h
 )
 
+set(LIB
+	bf_editor_mask
+	bf_editor_uvedit
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
@@ -75,4 +80,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_info/CMakeLists.txt

@@ -57,4 +57,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_logic/CMakeLists.txt

@@ -55,4 +55,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_nla/CMakeLists.txt

@@ -47,10 +47,14 @@ set(SRC
 	nla_intern.h
 )
 
+set(LIB
+	bf_editor_space_action
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_node/CMakeLists.txt

@@ -68,4 +68,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_outliner/CMakeLists.txt

@@ -48,10 +48,17 @@ set(SRC
 	outliner_intern.h
 )
 
+set(LIB
+	bf_editor_armature
+	bf_editor_object
+	bf_physics
+	bf_editor_space_sequencer
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_script/CMakeLists.txt

@@ -51,4 +51,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_sequencer/CMakeLists.txt

@@ -52,6 +52,10 @@ set(SRC
 	sequencer_intern.h
 )
 
+set(LIB
+	bf_editor_interface
+)
+
 if(WITH_AUDASPACE)
 	add_definitions(${AUDASPACE_DEFINITIONS})
 
@@ -66,4 +70,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_text/CMakeLists.txt

@@ -51,6 +51,10 @@ set(SRC
 	text_intern.h
 )
 
+set(LIB
+	bf_blenkernel
+)
+
 add_definitions(${GL_DEFINITIONS})
 
 if(WITH_PYTHON)
@@ -64,4 +68,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_time/CMakeLists.txt

@@ -43,4 +43,4 @@ set(SRC
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_userpref/CMakeLists.txt

@@ -39,4 +39,4 @@ set(SRC
 	userpref_intern.h
 )
 
-blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/space_view3d/CMakeLists.txt

@@ -68,6 +68,17 @@ set(SRC
 	view3d_intern.h
 )
 
+set(LIB
+	bf_editor_animation
+	bf_editor_gpencil
+	bf_editor_space_api
+	bf_editor_transform
+	bf_editor_util
+	bf_editor_uvedit
+	bf_gpu
+	bf_python_ext
+)
+
 if(WITH_PYTHON)
 	blender_include_dirs(../../python)
 	add_definitions(-DWITH_PYTHON)
@@ -94,4 +105,4 @@ if(WITH_LEGACY_DEPSGRAPH)
 	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
 endif()
 
-blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/transform/CMakeLists.txt

@@ -52,6 +52,10 @@ set(SRC
 	transform.h
 )
 
+set(LIB
+	bf_editor_space_nla
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
@@ -62,4 +66,4 @@ endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/util/CMakeLists.txt

@@ -95,6 +95,26 @@ set(SRC
 	../include/UI_view2d.h
 )
 
+set(LIB
+	bf_editor_armature
+	bf_editor_curve
+	bf_editor_gpencil
+	bf_editor_interface
+	bf_editor_mesh
+	bf_editor_metaball
+	bf_editor_object
+	bf_editor_physics
+	bf_editor_render
+	bf_editor_screen
+	bf_editor_sculpt_paint
+	bf_editor_space_buttons
+	bf_editor_space_node
+	bf_editor_space_outliner
+	bf_editor_space_text
+	bf_editor_space_view3d
+	bf_blenkernel
+)
+
 add_definitions(${GL_DEFINITIONS})
 
 if(WITH_INTERNATIONAL)
@@ -108,4 +128,4 @@ if(WITH_PYTHON)
 	)
 endif()
 
-blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/editors/uvedit/CMakeLists.txt

@@ -48,17 +48,25 @@ set(SRC
 	uvedit_parametrizer.h
 )
 
+set(LIB
+	bf_editor_object
+	bf_blenlib
+)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 if(WITH_OPENNL)
-	add_definitions(-DWITH_OPENNL)
 	list(APPEND INC_SYS
 		../../../../intern/opennl/extern
 	)
+	list(APPEND LIB
+		bf_intern_opennl
+	)
+	add_definitions(-DWITH_OPENNL)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/freestyle/CMakeLists.txt

@@ -580,4 +580,4 @@ if(WIN32)
 	)
 endif()
 
-blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/gpu/CMakeLists.txt

@@ -92,6 +92,10 @@ set(SRC
 	intern/gpu_private.h
 )
 
+set(LIB
+
+)
+
 data_to_c_simple(shaders/gpu_shader_geometry.glsl SRC)
 data_to_c_simple(shaders/gpu_program_smoke_frag.glsl SRC)
 data_to_c_simple(shaders/gpu_program_smoke_color_frag.glsl SRC)
@@ -119,6 +123,9 @@ if(WITH_GAMEENGINE)
 endif()
 
 if(WITH_MOD_SMOKE)
+	list(APPEND LIB
+		bf_intern_smoke
+	)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
@@ -132,5 +139,5 @@ if(WITH_OPENSUBDIV)
 	add_definitions(-DWITH_OPENSUBDIV)
 endif()
 
-blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 

source/blender/ikplugin/CMakeLists.txt

@@ -44,6 +44,11 @@ set(SRC
 	intern/ikplugin_api.h
 )
 
+set(LIB
+
+)
+
+
 if(WITH_IK_SOLVER)
 	add_definitions(-DWITH_IK_SOLVER)
 	list(APPEND INC
@@ -53,6 +58,9 @@ if(WITH_IK_SOLVER)
 		intern/iksolver_plugin.c
 		intern/iksolver_plugin.h
 	)
+	list(APPEND LIB
+		bf_intern_iksolver
+	)
 endif()
 
 if(WITH_IK_ITASC)
@@ -67,6 +75,9 @@ if(WITH_IK_ITASC)
 		intern/itasc_plugin.cpp
 		intern/itasc_plugin.h
 	)
+	list(APPEND LIB
+		bf_intern_itasc
+	)
 endif()
 
-blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/imbuf/CMakeLists.txt

@@ -88,6 +88,11 @@ set(SRC
 	../../../intern/ffmpeg/ffmpeg_compat.h
 )
 
+set(LIB
+	bf_blenfont
+	bf_intern_opencolorio
+)
+
 if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 else()
@@ -109,6 +114,9 @@ endif()
 
 
 if(WITH_OPENIMAGEIO)
+	list(APPEND LIB
+		bf_imbuf_openimageio
+	)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
@@ -119,7 +127,9 @@ if(WITH_IMAGE_OPENJPEG)
 	list(APPEND SRC
 		intern/jp2.c
 	)
-
+	list(APPEND LIB
+		${OPENJPEG_LIBRARIES}
+	)
 	add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
 endif()
 
@@ -127,6 +137,9 @@ if(WITH_IMAGE_REDCODE)
 	list(APPEND INC_SYS
 		${REDCODE_INC}
 	)
+	list(APPEND LIB
+		extern_redcode
+	)
 	add_definitions(-DWITH_REDCODE)
 endif()
 
@@ -164,10 +177,16 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_IMAGE_DDS)
+	list(APPEND LIB
+		bf_imbuf_dds
+	)
 	add_definitions(-DWITH_DDS)
 endif()
 
 if(WITH_IMAGE_CINEON)
+	list(APPEND LIB
+		bf_imbuf_cineon
+	)
 	add_definitions(-DWITH_CINEON)
 endif()
 
@@ -188,4 +207,4 @@ if(WIN32)
 	)
 endif()
 
-blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/imbuf/intern/cineon/CMakeLists.txt

@@ -55,4 +55,4 @@ if(WITH_IMAGE_CINEON)
 	add_definitions(-DWITH_CINEON)
 endif()
 
-blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/imbuf/intern/dds/CMakeLists.txt

@@ -63,4 +63,4 @@ if(WITH_IMAGE_DDS)
 	add_definitions(-DWITH_DDS)
 endif()
 
-blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

source/blender/imbuf/intern/oiio/CMakeLists.txt

@@ -52,4 +52,4 @@ if(WITH_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
-blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")