ec4fc2d34a
This continues the cmake modernization effort and introduces support for allowing our optional dependencies to integrate properly. TBB is added here as it's proven troublesome to maintain correctly. Currently the only Blender project which uses the TBB headers directly is `blenlib`. However, all downstream projects which require blenlib as their dependency, and wish to properly make use of its threading facilities, needed to define various TBB items in their CMake files. Not only is this unnecessary and arcane, but several projects didn't do this and ended up not using threading as well as producing ODR violations along the way[1]. This PR makes TBB a modern dependency and exposes it PUBLIC'ly from `blenlib`. All downstream projects which depend on blenlib will now receive everything they require from TBB automatically. This includes the `WITH_TBB` define, the headers, and the library itself. [1] blender/blender@05241f47f5 Pull Request: https://projects.blender.org/blender/blender/pulls/124916
76 lines
1.8 KiB
CMake
76 lines
1.8 KiB
CMake
# SPDX-FileCopyrightText: 2023 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
)
|
|
|
|
set(INC_SYS
|
|
)
|
|
|
|
set(SRC
|
|
intern/field.cc
|
|
intern/lazy_function.cc
|
|
intern/lazy_function_execute.cc
|
|
intern/lazy_function_graph.cc
|
|
intern/lazy_function_graph_executor.cc
|
|
intern/multi_function.cc
|
|
intern/multi_function_builder.cc
|
|
intern/multi_function_params.cc
|
|
intern/multi_function_procedure.cc
|
|
intern/multi_function_procedure_builder.cc
|
|
intern/multi_function_procedure_executor.cc
|
|
intern/multi_function_procedure_optimization.cc
|
|
|
|
FN_field.hh
|
|
FN_lazy_function.hh
|
|
FN_lazy_function_execute.hh
|
|
FN_lazy_function_graph.hh
|
|
FN_lazy_function_graph_executor.hh
|
|
FN_multi_function.hh
|
|
FN_multi_function_builder.hh
|
|
FN_multi_function_context.hh
|
|
FN_multi_function_data_type.hh
|
|
FN_multi_function_param_type.hh
|
|
FN_multi_function_params.hh
|
|
FN_multi_function_procedure.hh
|
|
FN_multi_function_procedure_builder.hh
|
|
FN_multi_function_procedure_executor.hh
|
|
FN_multi_function_procedure_optimization.hh
|
|
FN_multi_function_signature.hh
|
|
)
|
|
|
|
set(LIB
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::dna
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
if(WITH_TBB)
|
|
if(WIN32)
|
|
# TBB includes Windows.h which will define min/max macros
|
|
# that will collide with the stl versions.
|
|
add_definitions(-DNOMINMAX)
|
|
endif()
|
|
endif()
|
|
|
|
blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_INC
|
|
)
|
|
set(TEST_SRC
|
|
tests/FN_field_test.cc
|
|
tests/FN_lazy_function_test.cc
|
|
tests/FN_multi_function_procedure_test.cc
|
|
tests/FN_multi_function_test.cc
|
|
|
|
tests/FN_multi_function_test_common.hh
|
|
)
|
|
set(TEST_LIB
|
|
bf_functions
|
|
)
|
|
blender_add_test_suite_lib(function "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
|
|
endif()
|