diff options
62 files changed, 331 insertions, 6 deletions
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 ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 53b527dd1f7..fa91ffd1e72 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -62,6 +62,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 78b0202dc22..fd6b0e4a0c5 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -80,6 +80,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_editor_datafiles ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 1aa6de534c4..6e3e111739c 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -47,13 +47,21 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_OPENCOLLADA) + list(APPEND LIB + bf_collada + ) add_definitions(-DWITH_COLLADA) endif() if(WITH_ALEMBIC) + list(APPEND LIB + bf_alembic + ) add_definitions(-DWITH_ALEMBIC) if(WITH_ALEMBIC_HDF5) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 41e247b8d77..707aeb781c6 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -73,6 +73,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 7a5eee4bfbb..75d2fada7f3 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -69,6 +69,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_render ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 25b76f549a2..39a34ed7a47 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -51,15 +51,26 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) 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 LIB + bf_intern_smoke + ) +endif() + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt index 0768e0ee571..be1cd09f965 100644 --- a/source/blender/editors/scene/CMakeLists.txt +++ b/source/blender/editors/scene/CMakeLists.txt @@ -35,6 +35,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index a4a0b873c92..11516a73d1e 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -55,6 +55,8 @@ set(SRC ) set(LIB + bf_editor_datafiles + bf_editor_space_sequencer ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index d772a1a0541..e7a8c704fda 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -65,6 +65,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index a7d128a261d..8b1caa0f306 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -36,12 +36,17 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_AUDASPACE) list(APPEND INC_SYS ${AUDASPACE_C_INCLUDE_DIRS} ) + list(APPEND LIB + bf_intern_audaspace + ) add_definitions(-DWITH_AUDASPACE) endif() diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index aff4e75abb7..853577180bb 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -45,6 +45,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 8f744269de8..6a440f38eb8 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -35,6 +35,26 @@ set(SRC ) 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_nla + bf_editor_space_node + bf_editor_space_outliner + bf_editor_space_script + bf_editor_space_sequencer + bf_editor_space_statusbar + bf_editor_space_text + bf_editor_space_topbar + bf_editor_space_userpref + bf_editor_space_view3d ) blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index d770a85709a..49d7efb5669 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -64,6 +64,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index d68e7745bdf..d8645c3674a 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -41,6 +41,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_PYTHON) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 391d0dff0f5..e0fc7500f94 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -46,12 +46,17 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_AUDASPACE) list(APPEND INC_SYS ${AUDASPACE_C_INCLUDE_DIRS} ) + list(APPEND LIB + bf_intern_audaspace + ) add_definitions(-DWITH_AUDASPACE) endif() diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 99ede338dee..2687849f211 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -48,6 +48,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_editor_uvedit ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 35c29ad4492..f22cc378a60 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -46,6 +46,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 2c1ec0cc834..5e2437c99ca 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -58,6 +58,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_editor_screen ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index ae2d52533fe..83832d62b9e 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -50,6 +50,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_editor_undo ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index bf70473610d..5724e811e77 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -51,6 +51,8 @@ set(SRC ) set(LIB + bf_editor_interface + bf_editor_util ) if(WITH_AUDASPACE) diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 3b1372b419e..63562621d34 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -38,6 +38,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index b542732fc54..f4054a0dd0e 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -52,6 +52,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index e3f5245fc59..837671d6f94 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -73,6 +73,8 @@ set(SRC ) set(LIB + bf_editor_lattice + bf_editor_mesh ) if(WITH_PYTHON) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 7d3690df826..c475a9e4e3d 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -55,6 +55,12 @@ set(SRC ) set(LIB + bf_blenfont + bf_blenkernel + bf_blenlib + bf_bmesh + bf_editor_mask + bf_gpu ) if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index 3a6aded0c08..cebfa0d67f4 100644 --- a/source/blender/editors/undo/CMakeLists.txt +++ b/source/blender/editors/undo/CMakeLists.txt @@ -37,6 +37,13 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_editor_curve + bf_editor_lattice + bf_editor_mesh + bf_editor_metaball + bf_editor_physics ) if(WITH_INTERNATIONAL) diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 9dfeb065902..4292eef400c 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -548,6 +548,7 @@ set(SRC ) set(LIB + bf_python_mathutils ) set(INC diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 430eefe6fc7..d7a03280894 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -124,6 +124,7 @@ set(SRC ) set(LIB + extern_glew ) data_to_c_simple(shaders/gpu_shader_depth_only_frag.glsl SRC) diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index e741bf92925..654d83d71af 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -43,6 +43,9 @@ set(LIB ) if(WITH_IK_SOLVER) + list(APPEND LIB + bf_intern_iksolver + ) list(APPEND INC ../../../intern/iksolver/extern ) @@ -54,6 +57,9 @@ if(WITH_IK_SOLVER) endif() if(WITH_IK_ITASC) + list(APPEND LIB + bf_intern_itasc + ) list(APPEND INC ../../../intern/itasc ) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 5c16e0d162a..5d859717e33 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -84,9 +84,17 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_blenloader + bf_intern_guardedalloc + bf_intern_memutil ) if(WITH_IMAGE_OPENEXR) + list(APPEND LIB + bf_imbuf_openexr + ) add_definitions(-DWITH_OPENEXR) else() list(APPEND SRC @@ -106,6 +114,9 @@ endif() if(WITH_OPENIMAGEIO) + list(APPEND LIB + bf_imbuf_openimageio + ) add_definitions(-DWITH_OPENIMAGEIO) endif() @@ -124,6 +135,9 @@ if(WITH_CODEC_AVI) list(APPEND INC ../avi ) + list(APPEND LIB + bf_avi + ) add_definitions(-DWITH_AVI) endif() @@ -144,10 +158,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() diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 8521e06c328..81ea7c03b86 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -373,6 +373,23 @@ set(SRC ) set(LIB + bf_editor_armature + bf_editor_curve + bf_editor_gizmo_library + bf_editor_gpencil + bf_editor_mesh + bf_editor_object + bf_editor_physics + bf_editor_render + bf_editor_scene + bf_editor_sculpt_paint + bf_editor_space_clip + bf_editor_space_file + bf_editor_space_image + bf_editor_space_info + bf_editor_space_node + bf_editor_space_view3d + bf_editor_transform ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 8cf6382608d..33bdd900556 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -109,6 +109,8 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib ) if(WITH_ALEMBIC) @@ -116,12 +118,18 @@ if(WITH_ALEMBIC) list(APPEND INC ../alembic ) + list(APPEND LIB + bf_alembic + ) endif() if(WITH_MOD_REMESH) list(APPEND INC ../../../intern/dualcon ) + list(APPEND LIB + bf_intern_dualcon + ) add_definitions(-DWITH_MOD_REMESH) endif() @@ -134,6 +142,9 @@ if(WITH_MOD_OCEANSIM) endif() if(WITH_BULLET) + list(APPEND LIB + extern_bullet + ) add_definitions(-DWITH_BULLET) endif() diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index 8e92b43eb46..23ecdf4aa75 100644 --- a/source/blender/python/bmesh/CMakeLists.txt +++ b/source/blender/python/bmesh/CMakeLists.txt @@ -52,6 +52,9 @@ set(SRC ) set(LIB + bf_blenkernel + bf_blenlib + bf_python_mathutils ) if(WITH_FREESTYLE) diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 3ebd90e5b42..ea766d9f8d1 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -51,6 +51,7 @@ set(SRC ) set(LIB + ${GLEW_LIBRARY} ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index d517d6a9529..f8b493b05d4 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -118,6 +118,9 @@ set(SRC ) set(LIB + bf_editor_interface + bf_editor_space_api + bf_python_gpu ) # only to check if buildinfo is available diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index b973875977a..7b0c042d50a 100644 --- a/source/blender/python/mathutils/CMakeLists.txt +++ b/source/blender/python/mathutils/CMakeLists.txt @@ -56,6 +56,8 @@ set(SRC ) set(LIB + bf_blenlib + bf_python_ext ) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 96c8b9c860b..d6bbbbd3061 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -80,6 +80,9 @@ if(WITH_PYTHON) endif() if(WITH_IMAGE_OPENEXR) + list(APPEND LIB + bf_imbuf_openexr + ) add_definitions(-DWITH_OPENEXR) endif() @@ -91,6 +94,9 @@ if(WITH_FREESTYLE) list(APPEND INC ../freestyle ) + list(APPEND LIB + bf_freestyle + ) add_definitions(-DWITH_FREESTYLE) endif() diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 3f4f18005ef..63253c3737b 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -107,6 +107,7 @@ set(SRC ) set(LIB + bf_editor_screen ) if(WITH_AUDASPACE) @@ -166,6 +167,9 @@ if(WIN32) endif() if(WITH_COMPOSITOR) + list(APPEND LIB + bf_compositor + ) add_definitions(-DWITH_COMPOSITOR) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 5111e2b5491..83e1c9557a0 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -38,6 +38,22 @@ blender_include_dirs( ) set(LIB + bf_blenfont + bf_blenkernel + bf_blenlib + bf_blenloader + bf_depsgraph + bf_dna + bf_editor_datafiles + bf_imbuf + bf_intern_clog + bf_intern_guardedalloc + bf_intern_memutil + bf_intern_opencolorio + bf_python + bf_render + bf_rna + bf_windowmanager ) add_definitions(${GL_DEFINITIONS}) @@ -57,6 +73,9 @@ if(WITH_CYCLES) blender_include_dirs(../../intern/cycles/blender) add_definitions(-DWITH_CYCLES_LOGGING) endif() + list(APPEND LIB + bf_intern_cycles + ) endif() if(WITH_CODEC_FFMPEG) @@ -86,11 +105,17 @@ endif() if(WITH_BINRELOC) blender_include_dirs(${BINRELOC_INCLUDE_DIRS}) + list(APPEND LIB + extern_binreloc + ) add_definitions(-DWITH_BINRELOC) endif() if(WITH_FREESTYLE) blender_include_dirs(../blender/freestyle) + list(APPEND LIB + bf_freestyle + ) add_definitions(-DWITH_FREESTYLE) endif() |