[Bf-blender-cvs] [64c7bd16548] temp-cmake-without-sorted-libs: CMake: initial removal of sorted libs

Campbell Barton noreply at git.blender.org
Mon Apr 15 08:55:43 CEST 2019


Commit: 64c7bd165486654f5d219a1ee4a7066acc37c1fa
Author: Campbell Barton
Date:   Mon Apr 15 08:55:04 2019 +0200
Branches: temp-cmake-without-sorted-libs
https://developer.blender.org/rB64c7bd165486654f5d219a1ee4a7066acc37c1fa

CMake: initial removal of sorted libs

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

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/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/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 0531eb71ba5..7653bc4852f 100644
--- a/extern/ceres/CMakeLists.txt
+++ b/extern/ceres/CMakeLists.txt
@@ -256,6 +256,10 @@ set(SRC
 	internal/ceres/wall_time.h
 )
 
+set(LIB
+	extern_glog
+)
+
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 	list(APPEND SRC
 		internal/ceres/generated/partitioned_matrix_view_2_2_2.cc
@@ -319,4 +323,4 @@ if(WITH_OPENMP)
 	)
 endif()
 
-blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "")
+blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh
index e8212aa1d41..561e2b404c1 100755
--- a/extern/ceres/bundle.sh
+++ b/extern/ceres/bundle.sh
@@ -109,10 +109,6 @@ cat > CMakeLists.txt << EOF
 #
 # The Original Code is Copyright (C) 2012, Blender Foundation
 # All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-#                 Sergey Sharybin
-#
 # ***** END GPL LICENSE BLOCK *****
 
 # NOTE: This file is automatically generated by bundle.sh script
@@ -139,6 +135,10 @@ ${sources}
 ${headers}
 )
 
+set(LIB
+	extern_glog
+)
+
 if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 	list(APPEND SRC
 ${generated_sources}
@@ -165,5 +165,5 @@ if(WITH_OPENMP)
 	)
 endif()
 
-blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "")
+blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
 EOF
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/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index eeec5ab1528..ace05370594 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)
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 5adfdbea1af..b2193ae7320 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -33,6 +33,11 @@ set(SRC
 	libmv-capi.h
 )
 
+set(LIB
+	extern_ceres
+	extern_glog
+)
+
 if(WITH_LIBMV)
 	add_definitions(${GFLAGS_DEFINES})
 	add_definitions(${GLOG_DEFINES})
@@ -232,4 +237,4 @@ else()
 	)
 endif()
 
-blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "")
+blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 98a1e364634..ca7f22a1e5a 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -95,10 +95,6 @@ cat > CMakeLists.txt << EOF
 #
 # The Original Code is Copyright (C) 2011, Blender Foundation
 # All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-#                 Sergey Sharybin
-#
 # ***** END GPL LICENSE BLOCK *****
 
 # NOTE: This file is automatically generated by bundle.sh script
@@ -116,6 +112,11 @@ set(SRC
 	libmv-capi.h
 )
 
+set(LIB
+	extern_ceres
+	extern_glog
+)
+
 if(WITH_LIBMV)
 	add_definitions(\${GFLAGS_DEFINES})
 	add_definitions(\${GLOG_DEFINES})
@@ -184,5 +185,5 @@ else()
 	)
 endif()
 
-blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "")
+blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
 EOF
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 8e6a912b071..757204fd2b6 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -44,7 +44,6 @@ set(INC
 	../../../intern/iksolver/extern
 	../../../intern/memutil
 	../../../intern/mikktspace
-	../../../intern/smoke/extern
 	../../../intern/atomic
 	../../../intern/clog
 	../../../intern/libmv
@@ -356,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)
@@ -388,6 +412,10 @@ if(WITH_BULLET)
 	list(APPEND INC
 		../../../intern/rigidbody
 	)
+	list(APPEND LIB
+		bf_intern_rigidbody
+		extern_bullet
+	)
 	add_definitions(-DWITH_BULLET)
 endif()
 
@@ -482,10 +510,19 @@ if(WITH_MOD_FLUID)
 	list(APPEND INC
 		../../../intern/elbeem/extern
 	)
+	list(APPEND LIB
+		bf_intern_elbeem
+	)
 	add_definitions(-DWITH_MOD_FLUID)
 endif()
 
 if(WITH_MOD_SMOKE)
+	list(APPEND INC
+		../../../intern/smoke/extern
+	)
+	list(APPEND LIB
+		bf_intern_smoke
+	)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
@@ -507,6 +544,9 @@ if(WITH_LZO)
 		list(APPEND INC_SYS
 			../../../extern/lzo/minilzo
 		)
+		list(APPEND LIB
+			extern_minilzo
+		)
 	endif()
 	add_definitions(-DWITH_LZO)
 endif()
@@ -515,6 +555,9 @@ if(WITH_LZMA)
 	list(APPEND INC_SYS
 		../../../extern/lzma
 	)
+	list(APPEND LIB
+		extern_lzma
+	)
 	add_definitions(-DWITH_LZMA)
 endif()
 
@@ -545,17 +588,17 @@ if(WITH_ALEMBIC)
 endif()
 
 if(WITH_OPENSUBDIV)
-	add_definitions(-DWITH_OPENSUBDIV)
 	list(APPEND INC_SYS
 		${OPENSUBDIV_INCLUDE_DIRS}
 	)
+	add_definitions(-DWITH_OPENSUBDIV)
 endif()
 
 if(WITH_OPENVDB)
-	add_definitions(-DWITH_OPENVDB)
 	list(APPEND INC
 		 ../../../intern/openvdb
 	)
+	add_definitions(-DWITH_OPENVDB)
 
 	if(WITH_OPENVDB_BLOSC)
 		add_definitions(
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..47543ade807 100644
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -40,6 +40,9 @@ set(SRC
 )
 
 set(LIB
+	bf_blenkernel
+	bf_blenlib
+	bf_intern_locale
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index be6c819bc1f..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)
@@ -171,10 +172,13 @@ if(MSVC AND NOT MSVC_CLANG)
 endif()
 
 if(WITH_BULLET)
-	add_definitions(-DWITH_BULLET)
 	list(APPEND INC_SYS
 		${BULLET_INCLUDE_DIRS}
 	)
+	list(APPEND LIB
+		extern_bullet
+	)
+	add_definitions(-DWITH_BULLET)
 endif()
 
 if(WITH_INTERNATIONAL)
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


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list