diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:18:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-14 16:37:24 +0300 |
commit | 47adab4f993e66328bd1ad97abaf6697784ee8a0 (patch) | |
tree | 3eb7046a95b0ce3f2ad707764213df372f22abbd /source | |
parent | eee5a880f186fe9e49bd41a9dc7d6d0bdd371c36 (diff) |
CMake: prepare for BLENDER_SORTED_LIBS removal
No functional change, this adds LIB definition and args to cmake files.
Without this it's difficult to migrate away from 'BLENDER_SORTED_LIBS'
since there are many platforms/configurations that could break when
changing linking order.
Manually add and enable WITHOUT_SORTED_LIBS to try building
without sorted libs (currently fails since all variables are empty).
This check will eventually be removed.
See T46725.
Diffstat (limited to 'source')
77 files changed, 313 insertions, 78 deletions
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/alembic/CMakeLists.txt index 813653b74c0..e6badc27110 100644 --- a/source/blender/alembic/CMakeLists.txt +++ b/source/blender/alembic/CMakeLists.txt @@ -72,8 +72,11 @@ set(SRC intern/abc_util.h ) +set(LIB +) + if(WITH_ALEMBIC_HDF5) add_definitions(-DWITH_ALEMBIC_HDF5) endif() -blender_add_lib(bf_alembic "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_alembic "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index d5d062bb826..b03c1a433fb 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -46,4 +46,7 @@ set(SRC intern/avi_rgb32.h ) -blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index e8a7750c445..25497d1b1c2 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -51,6 +51,9 @@ set(SRC intern/blf_internal_types.h ) +set(LIB +) + if(WIN32) list(APPEND SRC intern/blf_font_win32_compat.c @@ -70,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}") diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index c882be972f5..8e6a912b071 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -355,6 +355,9 @@ set(SRC intern/subdiv_inline.h ) +set(LIB +) + if(WITH_BINRELOC) list(APPEND INC_SYS ${BINRELOC_INCLUDE_DIRS} @@ -566,4 +569,4 @@ endif() # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") #endif() -blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 09573d31a76..18332f5ddea 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -233,6 +233,9 @@ set(SRC PIL_time_utildefines.h ) +set(LIB +) + if(WITH_MEM_VALGRIND) add_definitions(-DWITH_MEM_VALGRIND) endif() @@ -254,4 +257,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}") diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index b9bec1b97b3..26d1ee14856 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -67,6 +67,9 @@ set(SRC intern/readfile.h ) +set(LIB +) + if(WITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO) endif() @@ -92,7 +95,7 @@ if(WITH_ALEMBIC) add_definitions(-DWITH_ALEMBIC) endif() -blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # needed so writefile.c can use dna_type_offsets.h add_dependencies(bf_blenloader bf_dna) diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt index fa3f8c47bee..2a397af051d 100644 --- a/source/blender/blentranslation/CMakeLists.txt +++ b/source/blender/blentranslation/CMakeLists.txt @@ -39,6 +39,9 @@ set(SRC BLT_translation.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -56,7 +59,7 @@ if(WIN32) endif() endif() -blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") if(WITH_INTERNATIONAL) add_subdirectory(msgfmt) diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 631886ac86e..be6c819bc1f 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -163,6 +163,9 @@ set(SRC bmesh_tools.h ) +set(LIB +) + if(MSVC AND NOT MSVC_CLANG) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4101") endif() @@ -182,4 +185,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}") diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 41178b542eb..7a02068f42d 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -125,6 +125,9 @@ set(SRC collada_utils.h ) +set(LIB +) + if(WITH_BUILDINFO) add_definitions(-DWITH_BUILDINFO) endif() @@ -138,4 +141,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}") diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 306c06c4576..67e7afefcd3 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -539,6 +539,9 @@ set(SRC operations/COM_MaskOperation.h ) +set(LIB +) + list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}/operations ) @@ -552,4 +555,4 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 9a619ef560d..b75356addf7 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -109,6 +109,9 @@ set(SRC intern/depsgraph_update.h ) +set(LIB +) + if(WITH_BOOST) list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} @@ -116,4 +119,4 @@ if(WITH_BOOST) add_definitions(-DHAVE_BOOST_FUNCTION_BINDINGS) endif() -blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 3ac606fc48f..fe9b3d1f629 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -151,6 +151,9 @@ set(SRC engines/workbench/workbench_private.h ) +set(LIB +) + data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC) data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC) data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC) @@ -355,4 +358,4 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() -blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 933b4815175..14936e5bc2a 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -53,6 +53,9 @@ set(SRC anim_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -63,4 +66,4 @@ 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}") diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 0dd213d3bef..d63c53a6a09 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -58,10 +58,13 @@ set(SRC meshlaplacian.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 9d1b463ec42..726a744dd95 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -48,10 +48,13 @@ set(SRC curve_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 876af10f884..3a67cd80234 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -28,6 +28,9 @@ set(SRC ) +set(LIB +) + # Order matches "UI_icons.h", final name will be formatted: "icons{size}_{name}.dat" set(ICON_NAMES question @@ -845,4 +848,4 @@ endif() unset(ICON_NAMES) -blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt index 0e7b2a8be0f..0d2d9446889 100644 --- a/source/blender/editors/gizmo_library/CMakeLists.txt +++ b/source/blender/editors/gizmo_library/CMakeLists.txt @@ -58,6 +58,9 @@ set(SRC gizmo_types/value2d_gizmo.c ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 8532ea22827..53b527dd1f7 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -61,10 +61,13 @@ set(SRC gpencil_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 1ecd9e64924..78b0202dc22 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -79,6 +79,9 @@ set(SRC interface_regions_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -103,4 +106,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}") diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 2235e94180d..1aa6de534c4 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -46,6 +46,9 @@ set(SRC io_ops.h ) +set(LIB +) + if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() @@ -62,4 +65,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}") diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt index f14de01c102..5a231837d0b 100644 --- a/source/blender/editors/lattice/CMakeLists.txt +++ b/source/blender/editors/lattice/CMakeLists.txt @@ -41,4 +41,7 @@ set(SRC lattice_intern.h ) -blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt index 63f8dc78d13..a8ed6812897 100644 --- a/source/blender/editors/mask/CMakeLists.txt +++ b/source/blender/editors/mask/CMakeLists.txt @@ -47,6 +47,9 @@ set(SRC mask_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index bc8761f24c0..41e247b8d77 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -72,6 +72,9 @@ set(SRC mesh_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -86,4 +89,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}") diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index a0d6fb928ff..11547a0af6f 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -40,4 +40,7 @@ set(SRC mball_intern.h ) -blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index f15427e61ac..7a5eee4bfbb 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -68,6 +68,9 @@ set(SRC object_intern.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) if(WITH_PYTHON) @@ -78,4 +81,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}") diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 88d6f1b015c..1b42c3f2669 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -51,6 +51,9 @@ set(SRC physics_intern.h ) +set(LIB +) + if(WITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID) endif() @@ -68,4 +71,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}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index c65cada1cc0..dee56d7f2fa 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -50,6 +50,9 @@ set(SRC render_intern.h ) +set(LIB +) + if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) endif() @@ -67,4 +70,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}") diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt index 7f496cad060..0768e0ee571 100644 --- a/source/blender/editors/scene/CMakeLists.txt +++ b/source/blender/editors/scene/CMakeLists.txt @@ -34,8 +34,11 @@ set(SRC scene_edit.c ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -blender_add_lib(bf_editor_scene "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_scene "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 810adba3288..a4a0b873c92 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -54,10 +54,13 @@ set(SRC screen_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 704de3f7f9d..d772a1a0541 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -64,10 +64,13 @@ set(SRC sculpt_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 67ec2359c5e..41650f07101 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -35,6 +35,9 @@ set(SRC sound_intern.h ) +set(LIB +) + if(WITH_AUDASPACE) add_definitions(-DWITH_AUDASPACE) @@ -51,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}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 92cf40248ff..aff4e75abb7 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -44,6 +44,9 @@ set(SRC action_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 34436ae9b4d..8f744269de8 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -34,4 +34,7 @@ set(SRC spacetypes.c ) -blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index 90919fa793d..5ec2041c1dc 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -41,6 +41,9 @@ set(SRC buttons_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -51,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}") diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index a40a1bf6d25..d770a85709a 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -63,10 +63,13 @@ set(SRC tracking_ops_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index bed1b7dce96..d68e7745bdf 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -40,10 +40,13 @@ set(SRC console_intern.h ) +set(LIB +) + if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) 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}") diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 07ba1cc7a64..a92ed62cae2 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -52,6 +52,9 @@ set(SRC fsmenu.h ) +set(LIB +) + if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) endif() @@ -94,4 +97,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}") diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 20e2ebc0936..53c228cd9c9 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -45,6 +45,9 @@ set(SRC graph_intern.h ) +set(LIB +) + if(WITH_AUDASPACE) add_definitions(-DWITH_AUDASPACE) @@ -59,4 +62,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}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 77abfebc662..99ede338dee 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -47,6 +47,9 @@ set(SRC image_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -73,4 +76,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}") diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index f54e4921e6b..665d130e072 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -49,10 +49,13 @@ set(SRC textview.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index eb0d92e2e69..35c29ad4492 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -45,10 +45,13 @@ set(SRC nla_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 0950e738e3e..2c1ec0cc834 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -57,6 +57,9 @@ set(SRC node_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() @@ -67,4 +70,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}") diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 207a5c194bd..ae2d52533fe 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -49,10 +49,13 @@ set(SRC outliner_intern.h ) +set(LIB +) + 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}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 5d950a3558d..19b3e42b37a 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -39,6 +39,9 @@ set(SRC script_intern.h ) +set(LIB +) + if(WITH_PYTHON) list(APPEND INC ../../python @@ -48,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}") diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 7d76fa1af5c..bf70473610d 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -50,6 +50,9 @@ set(SRC sequencer_intern.h ) +set(LIB +) + if(WITH_AUDASPACE) add_definitions(-DWITH_AUDASPACE) @@ -64,4 +67,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}") diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 8440d410c31..3b1372b419e 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -37,6 +37,9 @@ set(SRC space_statusbar.c ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 378f2e5d84f..b542732fc54 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -51,6 +51,9 @@ set(SRC text_intern.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) if(WITH_PYTHON) @@ -64,4 +67,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}") diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt index 418a0eb3ad8..15352044d4a 100644 --- a/source/blender/editors/space_topbar/CMakeLists.txt +++ b/source/blender/editors/space_topbar/CMakeLists.txt @@ -37,6 +37,9 @@ set(SRC space_topbar.c ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index ec0c76c3d5b..d26766358ca 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -36,4 +36,7 @@ set(SRC userpref_intern.h ) -blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 83e65246797..e3f5245fc59 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -72,6 +72,9 @@ set(SRC view3d_intern.h ) +set(LIB +) + if(WITH_PYTHON) blender_include_dirs(../../python) add_definitions(-DWITH_PYTHON) @@ -91,4 +94,4 @@ if(WITH_MOD_SMOKE) add_definitions(-DWITH_SMOKE) endif() -blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 088128ba152..7d3690df826 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -54,10 +54,13 @@ set(SRC transform.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index 6ccba01c465..3a6aded0c08 100644 --- a/source/blender/editors/undo/CMakeLists.txt +++ b/source/blender/editors/undo/CMakeLists.txt @@ -36,8 +36,11 @@ set(SRC undo_intern.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 55298e5c4ab..728dacc1649 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -99,6 +99,9 @@ set(SRC ../include/UI_view2d.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) if(WITH_INTERNATIONAL) @@ -112,4 +115,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}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index c54c3851ee7..45cd9b09de3 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -47,10 +47,13 @@ set(SRC uvedit_parametrizer.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) 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}") diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index edab13d4286..9dfeb065902 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -547,6 +547,9 @@ set(SRC intern/winged_edge/WingedEdgeBuilder.h ) +set(LIB +) + set(INC . ../blenkernel @@ -581,4 +584,4 @@ if(WIN32) ) endif() -blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt index e1aad91050a..f7cfe073d4a 100644 --- a/source/blender/gpencil_modifiers/CMakeLists.txt +++ b/source/blender/gpencil_modifiers/CMakeLists.txt @@ -63,10 +63,13 @@ set(SRC MOD_gpencil_modifiertypes.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_gpencil_modifiers "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_gpencil_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index b76edf4068a..430eefe6fc7 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -123,6 +123,9 @@ set(SRC intern/gpu_vertex_format_private.h ) +set(LIB +) + data_to_c_simple(shaders/gpu_shader_depth_only_frag.glsl SRC) data_to_c_simple(shaders/gpu_shader_uniform_color_frag.glsl SRC) data_to_c_simple(shaders/gpu_shader_checker_frag.glsl SRC) @@ -255,4 +258,4 @@ if(WITH_IMAGE_DDS) add_definitions(-DWITH_DDS) endif() -blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 648486072f0..9bbc3a62b99 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -39,6 +39,9 @@ set(SRC intern/ikplugin_api.h ) +set(LIB +) + if(WITH_IK_SOLVER) add_definitions(-DWITH_IK_SOLVER) list(APPEND INC @@ -64,4 +67,4 @@ if(WITH_IK_ITASC) ) endif() -blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index dd020ffe1f2..87002e5efc0 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -83,6 +83,9 @@ set(SRC ../../../intern/ffmpeg/ffmpeg_compat.h ) +set(LIB +) + if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) else() @@ -172,4 +175,4 @@ set_source_files_properties( PROPERTIES HEADER_FILE_ONLY TRUE ) -blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 2a592aba860..2f6ca2793e3 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -45,8 +45,11 @@ set(SRC logmemfile.c ) +set(LIB +) + 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}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 6728dbc758d..c68608f4cff 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -54,8 +54,11 @@ set(SRC dds_api.cpp ) +set(LIB +) + 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}") diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 73438436abc..3311d3fd9b4 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -39,6 +39,9 @@ set(SRC openimageio_api.cpp ) +set(LIB +) + if(WITH_OPENIMAGEIO) list(APPEND INC_SYS ${OPENIMAGEIO_INCLUDE_DIRS} @@ -52,4 +55,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}") diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index 18f68d5b365..c9ede9ff07f 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -40,6 +40,9 @@ set(SRC openexr_api.cpp ) +set(LIB +) + if(WITH_IMAGE_OPENEXR) list(APPEND INC_SYS ${OPENEXR_INCLUDE_DIRS} @@ -47,4 +50,4 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 09f95d50f17..1082868c4d6 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -94,6 +94,9 @@ set(SRC dna_utils.h ) +set(LIB +) + set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.c @@ -101,7 +104,7 @@ set_source_files_properties( PROPERTIES GENERATED TRUE ) -blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # ----------------------------------------------------------------------------- @@ -125,4 +128,7 @@ set(SRC ../../blenlib/intern/listbase.c ) -blender_add_lib(bf_dna_blenlib "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_dna_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4aee3458a92..8521e06c328 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -372,6 +372,9 @@ set(SRC rna_mesh_utils.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 30dab865196..4873e08bb05 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -108,6 +108,9 @@ set(SRC intern/MOD_weightvg_util.h ) +set(LIB +) + if(WITH_ALEMBIC) add_definitions(-DWITH_ALEMBIC) list(APPEND INC @@ -141,4 +144,4 @@ endif() # So we can have special tricks in modifier system. add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index cc2bfbadf80..f58c43cf44f 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -258,6 +258,9 @@ set(SRC intern/node_util.h ) +set(LIB +) + if(WITH_PYTHON) list(APPEND INC ../python @@ -289,4 +292,4 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() -blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index 800cc6bbdc3..0a991bf2929 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/physics/CMakeLists.txt @@ -45,4 +45,7 @@ set(SRC BPH_mass_spring.h ) -blender_add_lib(bf_physics "${SRC}" "${INC}" "${INC_SYS}") +set(LIB +) + +blender_add_lib(bf_physics "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index c9524634f7e..8e92b43eb46 100644 --- a/source/blender/python/bmesh/CMakeLists.txt +++ b/source/blender/python/bmesh/CMakeLists.txt @@ -51,8 +51,11 @@ set(SRC bmesh_py_utils.h ) +set(LIB +) + if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() -blender_add_lib(bf_python_bmesh "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_bmesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index c7b361247ef..3ebd90e5b42 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -50,6 +50,9 @@ set(SRC python_utildefines.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt index 3c3a9b7e577..aeef81c5fd7 100644 --- a/source/blender/python/gpu/CMakeLists.txt +++ b/source/blender/python/gpu/CMakeLists.txt @@ -54,6 +54,9 @@ set(SRC gpu_py_vertex_format.h ) +set(LIB +) + add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 89e5e368ced..d517d6a9529 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -117,6 +117,9 @@ set(SRC ../BPY_extern_clog.h ) +set(LIB +) + # only to check if buildinfo is available if(WITH_BUILDINFO) add_definitions(-DBUILD_DATE) @@ -298,4 +301,4 @@ endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index 4a8d69f72fd..b973875977a 100644 --- a/source/blender/python/mathutils/CMakeLists.txt +++ b/source/blender/python/mathutils/CMakeLists.txt @@ -55,5 +55,8 @@ set(SRC mathutils_noise.h ) +set(LIB +) + -blender_add_lib(bf_python_mathutils "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_python_mathutils "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index fc2c0b324a9..96c8b9c860b 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -69,6 +69,9 @@ set(SRC intern/include/zbuf.h ) +set(LIB +) + if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) list(APPEND INC @@ -103,4 +106,4 @@ if(APPLE) endif() endif() -blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index ddd21449d40..e8f2a038dce 100644 --- a/source/blender/shader_fx/CMakeLists.txt +++ b/source/blender/shader_fx/CMakeLists.txt @@ -57,10 +57,13 @@ set(SRC FX_shader_types.h ) +set(LIB +) + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() add_definitions(${GL_DEFINITIONS}) -blender_add_lib(bf_shader_fx "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib(bf_shader_fx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 10f79691924..3f4f18005ef 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -106,6 +106,9 @@ set(SRC message_bus/wm_message_bus.h ) +set(LIB +) + if(WITH_AUDASPACE) add_definitions(-DWITH_AUDASPACE) @@ -166,4 +169,4 @@ if(WITH_COMPOSITOR) add_definitions(-DWITH_COMPOSITOR) endif() -blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}") +blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 812715ca042..e4045d0b77c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1022,7 +1022,11 @@ install( add_dependencies(blender makesdna) -setup_blender_sorted_libs() +# Use for testing 'BLENDER_SORTED_LIBS' removal. +if(NOT (DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)) + setup_blender_sorted_libs() +endif() + target_link_libraries(blender ${BLENDER_SORTED_LIBS}) setup_liblinks(blender) |