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.
This commit is contained in:
2019-04-14 15:18:44 +02:00
parent eee5a880f1
commit 47adab4f99
122 changed files with 490 additions and 127 deletions

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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)

View File

@@ -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)

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -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}")