[Bf-blender-cvs] [5498e7f193e] master: CMake: add library deps to CMakeLists.txt

Campbell Barton noreply at git.blender.org
Tue Apr 16 06:21:51 CEST 2019


Commit: 5498e7f193e2399b8693ef17803f864103307b4b
Author: Campbell Barton
Date:   Tue Apr 16 06:18:52 2019 +0200
Branches: master
https://developer.blender.org/rB5498e7f193e2399b8693ef17803f864103307b4b

CMake: add library deps to CMakeLists.txt

Tested to work on Linux and macOS.

This will be enabled once all platforms are verified.

See D4684

===================================================================

M	extern/ceres/CMakeLists.txt
M	extern/ceres/bundle.sh
M	extern/glog/CMakeLists.txt
M	intern/audaspace/CMakeLists.txt
M	intern/cycles/blender/CMakeLists.txt
M	intern/cycles/bvh/CMakeLists.txt
M	intern/cycles/device/CMakeLists.txt
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/osl/CMakeLists.txt
M	intern/cycles/render/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	intern/libmv/CMakeLists.txt
M	intern/libmv/bundle.sh
M	source/blender/blenfont/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blentranslation/CMakeLists.txt
M	source/blender/bmesh/CMakeLists.txt
M	source/blender/compositor/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/editors/animation/CMakeLists.txt
M	source/blender/editors/armature/CMakeLists.txt
M	source/blender/editors/curve/CMakeLists.txt
M	source/blender/editors/gpencil/CMakeLists.txt
M	source/blender/editors/interface/CMakeLists.txt
M	source/blender/editors/io/CMakeLists.txt
M	source/blender/editors/mesh/CMakeLists.txt
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/physics/CMakeLists.txt
M	source/blender/editors/scene/CMakeLists.txt
M	source/blender/editors/screen/CMakeLists.txt
M	source/blender/editors/sculpt_paint/CMakeLists.txt
M	source/blender/editors/sound/CMakeLists.txt
M	source/blender/editors/space_action/CMakeLists.txt
M	source/blender/editors/space_api/CMakeLists.txt
M	source/blender/editors/space_clip/CMakeLists.txt
M	source/blender/editors/space_console/CMakeLists.txt
M	source/blender/editors/space_graph/CMakeLists.txt
M	source/blender/editors/space_image/CMakeLists.txt
M	source/blender/editors/space_nla/CMakeLists.txt
M	source/blender/editors/space_node/CMakeLists.txt
M	source/blender/editors/space_outliner/CMakeLists.txt
M	source/blender/editors/space_sequencer/CMakeLists.txt
M	source/blender/editors/space_statusbar/CMakeLists.txt
M	source/blender/editors/space_text/CMakeLists.txt
M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/editors/transform/CMakeLists.txt
M	source/blender/editors/undo/CMakeLists.txt
M	source/blender/freestyle/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt
M	source/blender/ikplugin/CMakeLists.txt
M	source/blender/imbuf/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/python/bmesh/CMakeLists.txt
M	source/blender/python/generic/CMakeLists.txt
M	source/blender/python/intern/CMakeLists.txt
M	source/blender/python/mathutils/CMakeLists.txt
M	source/blender/render/CMakeLists.txt
M	source/blender/windowmanager/CMakeLists.txt
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt
index fad0734f52f..7653bc4852f 100644
--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -257,7 +257,7 @@ set(SRC
 )
 
 set(LIB
-
+	extern_glog
 )
 
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh
index b084eb4a00c..561e2b404c1 100755
--- a/extern/ceres/bundle.sh
+++ b/extern/ceres/bundle.sh
@@ -136,7 +136,7 @@ ${headers}
 )
 
 set(LIB
-
+	extern_glog
 )
 
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 1b1abbfc735..47c5063be1f 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -54,6 +54,7 @@ set(SRC
 )
 
 set(LIB
+	extern_gflags
 )
 
 if(WIN32)
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 6b828b204f1..21657d6f3c0 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -41,6 +41,12 @@ endif()
 set(LIB
 )
 
+if(NOT WITH_SYSTEM_AUDASPACE)
+	list(APPEND LIB
+		audaspace
+	)
+endif()
+
 if(WITH_PYTHON)
 	list(APPEND INC_SYS
 		${PYTHON_INCLUDE_DIRS}
@@ -49,6 +55,12 @@ if(WITH_PYTHON)
 		intern/AUD_PyInit.cpp
 		intern/AUD_PyInit.h
 	)
+	if(NOT WITH_SYSTEM_AUDASPACE)
+		list(APPEND LIB
+			audaspace-py
+		)
+	endif()
+
 	add_definitions(-DWITH_PYTHON)
 endif()
 
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 3f8868d793b..ccbe20b28a8 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -39,6 +39,13 @@ set(SRC
 )
 
 set(LIB
+	cycles_bvh
+	cycles_device
+	cycles_graph
+	cycles_kernel
+	cycles_render
+	cycles_subd
+	cycles_util
 )
 
 set(ADDON_FILES
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index 52f4138432b..ea31838d816 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -36,7 +36,7 @@ set(SRC_HEADERS
 )
 
 set(LIB
-
+	cycles_render
 )
 
 include_directories(${INC})
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index f0f0390c29b..d804a07bcab 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -62,6 +62,16 @@ set(LIB
 
 )
 
+if(WITH_CUDA_DYNLOAD)
+	list(APPEND LIB
+		extern_cuew
+	)
+else()
+	list(APPEND LIB
+		${CUDA_CUDA_LIBRARY}
+	)
+endif()
+
 add_definitions(${GL_DEFINITIONS})
 if(WITH_CYCLES_NETWORK)
 	add_definitions(-DWITH_NETWORK)
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index cbb69962781..01552dff9bb 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -474,6 +474,9 @@ endif()
 # OSL module
 
 if(WITH_CYCLES_OSL)
+	list(APPEND LIB
+		cycles_kernel_osl
+	)
 	add_subdirectory(osl)
 	add_subdirectory(shaders)
 endif()
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 804610bdc10..0a3d0b974cb 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -26,7 +26,7 @@ set(HEADER_SRC
 )
 
 set(LIB
-
+	cycles_render
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index af0f8b806a8..140fcb206dc 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -74,8 +74,15 @@ set(SRC_HEADERS
 )
 
 set(LIB
+	cycles_bvh
 )
 
+if(WITH_CYCLES_OSL)
+	list(APPEND LIB
+		cycles_kernel_osl
+	)
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
 
 include_directories(${INC})
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index eeec5ab1528..a43906cea85 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -85,6 +85,9 @@ set(SRC
 )
 
 set(LIB
+	bf_intern_glew_mx
+	bf_intern_string
+	${GLEW_LIBRARY}
 )
 
 if(WITH_GHOST_DEBUG)
@@ -195,6 +198,10 @@ elseif(WITH_X11)
 	if(WITH_GHOST_XDND)
 		add_definitions(-DWITH_XDND)
 
+		list(APPEND LIB
+			extern_xdnd
+		)
+
 		list(APPEND INC
 			../../extern/xdnd
 		)
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 91e638c9c45..b2193ae7320 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -34,7 +34,8 @@ set(SRC
 )
 
 set(LIB
-
+	extern_ceres
+	extern_glog
 )
 
 if(WITH_LIBMV)
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 27fc0e886a1..ca7f22a1e5a 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -113,7 +113,8 @@ set(SRC
 )
 
 set(LIB
-
+	extern_ceres
+	extern_glog
 )
 
 if(WITH_LIBMV)
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 25497d1b1c2..78d805398ef 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -52,6 +52,8 @@ set(SRC
 )
 
 set(LIB
+	bf_gpu
+	bf_intern_guardedalloc
 )
 
 if(WIN32)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 390ac51e470..696d252c81d 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -355,6 +355,31 @@ set(SRC
 )
 
 set(LIB
+	bf_editor_animation  # FIXME, bad level (compare_ak_cfraPtr)
+
+	bf_blenfont
+	bf_blenlib
+	bf_blenloader
+	bf_blentranslation
+	bf_bmesh
+	bf_depsgraph
+	bf_draw
+	bf_gpencil_modifiers
+	bf_gpu
+	bf_ikplugin
+	bf_imbuf
+	bf_intern_ghost
+	bf_intern_guardedalloc
+	bf_intern_libmv  # Uses stub when disabled.
+	bf_intern_mikktspace
+	bf_intern_opensubdiv  # Uses stub when disabled.
+	bf_modifiers
+	bf_nodes
+	bf_physics
+	bf_python
+	bf_python_bmesh
+	bf_rna
+	bf_shader_fx
 )
 
 if(WITH_BINRELOC)
@@ -387,6 +412,10 @@ if(WITH_BULLET)
 	list(APPEND INC
 		../../../intern/rigidbody
 	)
+	list(APPEND LIB
+		bf_intern_rigidbody
+		extern_bullet
+	)
 	add_definitions(-DWITH_BULLET)
 endif()
 
@@ -481,6 +510,9 @@ if(WITH_MOD_FLUID)
 	list(APPEND INC
 		../../../intern/elbeem/extern
 	)
+	list(APPEND LIB
+		bf_intern_elbeem
+	)
 	add_definitions(-DWITH_MOD_FLUID)
 endif()
 
@@ -488,6 +520,9 @@ if(WITH_MOD_SMOKE)
 	list(APPEND INC
 		../../../intern/smoke/extern
 	)
+	list(APPEND LIB
+		bf_intern_smoke
+	)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
@@ -509,6 +544,9 @@ if(WITH_LZO)
 		list(APPEND INC_SYS
 			../../../extern/lzo/minilzo
 		)
+		list(APPEND LIB
+			extern_minilzo
+		)
 	endif()
 	add_definitions(-DWITH_LZO)
 endif()
@@ -517,6 +555,9 @@ if(WITH_LZMA)
 	list(APPEND INC_SYS
 		../../../extern/lzma
 	)
+	list(APPEND LIB
+		extern_lzma
+	)
 	add_definitions(-DWITH_LZMA)
 endif()
 
@@ -557,6 +598,9 @@ if(WITH_OPENVDB)
 	list(APPEND INC
 		 ../../../intern/openvdb
 	)
+	list(APPEND LIB
+		 bf_intern_openvdb
+	)
 	add_definitions(-DWITH_OPENVDB)
 
 	if(WITH_OPENVDB_BLOSC)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 18332f5ddea..22cd4fbb237 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -234,6 +234,10 @@ set(SRC
 )
 
 set(LIB
+	bf_intern_eigen
+	bf_intern_guardedalloc
+	bf_intern_numaapi
+	extern_wcwidth
 )
 
 if(WITH_MEM_VALGRIND)
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 26d1ee14856..ffb77a02aa1 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -68,6 +68,8 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
 )
 
 if(WITH_BUILDINFO)
diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt
index 2a397af051d..5bb35d79373 100644
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -40,10 +40,15 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
 )
 
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
+	list(APPEND LIB
+		bf_intern_locale
+	)
 endif()
 
 if(WITH_PYTHON)
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 6e228bba3ee..7e34d1e7f04 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -164,6 +164,7 @@ set(SRC
 )
 
 set(LIB
+	extern_rangetree
 )
 
 if(MSVC AND NOT MSVC_CLANG)
@@ -174,6 +175,9 @@ if(WITH_BULLET)
 	list(APPEND INC_SYS
 		${BULLET_INCLUDE_DIRS}
 	)
+	list(APPEND LIB
+		extern_bullet
+	)
 	add_definitions(-DWITH_BULLET)
 endif()
 
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 67e7afefcd3..2b03b713e3c 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -540,6 +540,9 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
+	extern_clew
 )
 
 list(APPEND INC
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index fe9b3d1f629..a01e247cfe8 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -152,6 +152,8 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
 )
 
 data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 14936e5bc2a..a8de87e44e9 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -54,6 +54,8 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index d63c53a6a09..27eddd7e1dd 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -59,6 +59,8 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index 726a744dd95..4ccf8d59e1f 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -49,6 +49,9 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
+	extern_curve_fit_nd
 )
 


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list