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

View File

@ -222,6 +222,7 @@ function(blender_add_lib__impl
sources
includes
includes_sys
libraries
)
# message(STATUS "Configuring library ${name}")
@ -233,6 +234,11 @@ function(blender_add_lib__impl
add_library(${name} ${sources})
# Use for testing 'BLENDER_SORTED_LIBS' removal.
if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
target_link_libraries(${name} "${libraries}")
endif()
# works fine without having the includes
# listed is helpful for IDE's (QtCreator/MSVC)
blender_source_group("${sources}")
@ -257,11 +263,12 @@ function(blender_add_lib_nolist
sources
includes
includes_sys
libraries
)
add_cc_flags_custom_test(${name} PARENT_SCOPE)
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
endfunction()
function(blender_add_lib
@ -269,11 +276,12 @@ function(blender_add_lib
sources
includes
includes_sys
libraries
)
add_cc_flags_custom_test(${name} PARENT_SCOPE)
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${libraries}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
endfunction()

View File

@ -32,7 +32,10 @@ set(SRC
include/binreloc.h
)
set(LIB
)
add_definitions(-DENABLE_BINRELOC)
blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -407,9 +407,12 @@ set(SRC
src/Bullet-C-Api.h
)
set(LIB
)
if(CMAKE_COMPILER_IS_GNUCXX)
# needed for gcc 4.6+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -319,4 +319,4 @@ if(WITH_OPENMP)
)
endif()
blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_ceres "${SRC}" "${INC}" "${INC_SYS}" "")

View File

@ -165,5 +165,5 @@ if(WITH_OPENMP)
)
endif()
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}")
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "")
EOF

View File

@ -32,6 +32,9 @@ set(SRC
src/clew.c
)
set(LIB
)
add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_clew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -33,4 +33,7 @@ set(SRC
include/cuew.h
)
blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_cuew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -36,4 +36,7 @@ set(SRC
intern/generic_heap.h
)
blender_add_lib(extern_curve_fit_nd "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_curve_fit_nd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -178,8 +178,11 @@ set(SRC
src/draco/point_cloud/point_cloud.h
)
set(LIB
)
set(INC
src
)
blender_add_lib(dracoenc "${SRC}" "${INC}" "")
blender_add_lib(dracoenc "${SRC}" "${INC}" "" "${LIB}")

View File

@ -40,6 +40,9 @@ set(SRC
src/util.h
)
set(LIB
)
if(WIN32)
list(APPEND SRC
src/windows_port.cc
@ -49,4 +52,4 @@ endif()
add_definitions(${GFLAGS_DEFINES})
blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -42,6 +42,9 @@ set(SRC
include/GL/wglew.h
)
set(LIB
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -41,6 +41,9 @@ set(SRC
include/GL/wglew.h
)
set(LIB
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -53,6 +53,9 @@ set(SRC
src/stacktrace_x86-inl.h
)
set(LIB
)
if(WIN32)
list(APPEND SRC
src/windows/port.cc
@ -90,4 +93,4 @@ endif()
add_definitions(${GFLAGS_DEFINES})
add_definitions(${GLOG_DEFINES})
blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -66,4 +66,7 @@ set(SRC
include/gtest/internal/gtest-type-util.h
)
blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_gtest "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -42,4 +42,7 @@ set(SRC
Types.h
)
blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -36,4 +36,7 @@ set(SRC
minilzo/minilzo.h
)
blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -27,4 +27,7 @@ set(SRC
intern/range_tree.c
)
blender_add_lib(extern_rangetree "${SRC}" "${INC}" "")
set(LIB
)
blender_add_lib(extern_rangetree "${SRC}" "${INC}" "" "${LIB}")

View File

@ -32,4 +32,7 @@ set(SRC
src/sdlew.c
)
blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_sdlew "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -32,4 +32,7 @@ set(SRC
wcwidth.h
)
blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(extern_wcwidth "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -31,8 +31,11 @@ set(SRC
xdnd.h
)
set(LIB
)
add_definitions(
-DHAVE_SYS_TIME_H
)
blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(extern_xdnd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -38,6 +38,9 @@ endif()
intern/AUD_Set.h
)
set(LIB
)
if(WITH_PYTHON)
list(APPEND INC_SYS
${PYTHON_INCLUDE_DIRS}
@ -49,4 +52,4 @@ if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
endif()
blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -32,7 +32,10 @@ set(SRC
CLG_log.h
)
set(LIB
)
# Disabled for makesdna/makesrna.
add_definitions(-DWITH_CLOG_PTHREADS)
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -38,6 +38,9 @@ set(SRC
blender_util.h
)
set(LIB
)
set(ADDON_FILES
addon/__init__.py
addon/engine.py
@ -59,7 +62,7 @@ if(WITH_CYCLES_NETWORK)
add_definitions(-DWITH_NETWORK)
endif()
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
# avoid link failure with clang 3.4 debug
if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')

View File

@ -45,4 +45,7 @@ set(SRC
dualcon.h
)
blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -40,4 +40,7 @@ set(SRC
intern/svd.h
)
blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -85,6 +85,9 @@ set(SRC
intern/globals.h
)
set(LIB
)
# elbeem has some harmless UNUSED warnings
remove_strict_flags()
@ -116,4 +119,4 @@ else()
add_definitions(-DPARALLEL=0)
endif()
blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -84,6 +84,9 @@ set(SRC
intern/GHOST_WindowManager.h
)
set(LIB
)
if(WITH_GHOST_DEBUG)
list(APPEND SRC
intern/GHOST_EventPrinter.cpp
@ -337,4 +340,4 @@ endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -34,6 +34,9 @@ set(SRC
intern/symbol-binding.h
)
set(LIB
)
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_glew_mx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -40,6 +40,9 @@ set(SRC
../atomic/atomic_ops.h
)
set(LIB
)
if(WIN32 AND NOT UNIX)
list(APPEND SRC
intern/mmap_win.c
@ -53,12 +56,12 @@ if(WITH_MEM_JEMALLOC AND NOT ("${JEMALLOC_VERSION}" VERSION_LESS "5.0.0"))
add_definitions(-DWITH_JEMALLOC_CONF)
endif()
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
# Override C++ alloc, optional.
if(WITH_CXX_GUARDEDALLOC)
set(SRC
cpp/mallocn.cpp
)
blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
endif()

View File

@ -42,4 +42,7 @@ set(SRC
intern/IK_QTask.h
)
blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -353,6 +353,9 @@ set(SRC
${EIGEN3_HEADERS}
)
set(LIB
)
unset(EIGEN3_HEADERS)
blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -192,7 +192,7 @@ if(WITH_LIBMV)
if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "")
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "")
BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
@ -232,4 +232,4 @@ else()
)
endif()
blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "")

View File

@ -174,7 +174,7 @@ ${third_headers}
if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}")
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "")
${tests}
endif()
@ -184,5 +184,5 @@ else()
)
endif()
blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "")
EOF

View File

@ -31,6 +31,9 @@ set(SRC
boost_locale_wrapper.h
)
set(LIB
)
if(APPLE)
# Cocoa code to read the locale on OSX
list(APPEND SRC
@ -54,4 +57,4 @@ if(WITH_INTERNATIONAL)
add_definitions(${BOOST_DEFINITIONS})
endif()
blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -38,4 +38,7 @@ set(SRC
MEM_RefCountedC-Api.h
)
blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -39,4 +39,7 @@ set(SRC
mikktspace.h
)
blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -34,6 +34,9 @@ set(SRC
source/build_config.h
)
set(LIB
)
add_definitions(-DWITH_DYNLOAD)
blender_add_lib(bf_intern_numaapi "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_numaapi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -38,6 +38,9 @@ set(SRC
ocio_impl.h
)
set(LIB
)
if(WITH_OPENCOLORIO)
add_definitions(
-DWITH_OCIO
@ -69,4 +72,4 @@ if(WITH_OPENCOLORIO)
endif()
blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -35,6 +35,9 @@ set(SRC
opensubdiv_topology_refiner_capi.h
)
set(LIB
)
if(WITH_OPENSUBDIV)
macro(OPENSUBDIV_DEFINE_COMPONENT component)
if(${${component}})
@ -122,4 +125,4 @@ else()
)
endif()
blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_opensubdiv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -30,6 +30,9 @@ set(SRC
openvdb_capi.h
)
set(LIB
)
if(WITH_OPENVDB)
add_definitions(
-DWITH_OPENVDB
@ -69,4 +72,4 @@ if(WITH_OPENVDB)
endif()
endif()
blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -32,4 +32,7 @@ set(SRC
RBI_api.h
)
blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -77,6 +77,9 @@ set(SRC
intern/tnt/tnt_version.h
)
set(LIB
)
# quiet -Wundef
add_definitions(-DDDF_DEBUG=0)
@ -93,4 +96,4 @@ if(WITH_FFTW3)
)
endif()
blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -32,4 +32,7 @@ set(SRC
STR_String.h
)
blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}")
set(LIB
)
blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

View File

@ -30,6 +30,9 @@ set(SRC
utfconv.h
)
set(LIB
)
# This is odd but leave it for now...
# Why have win32 check here? - this is only used for windows.
# ... because one day we might want to use it on other platforms.
@ -40,4 +43,4 @@ if(WIN32)
)
endif()
blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}")
blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

Some files were not shown because too many files have changed in this diff Show More