4ea2baf4ae
The cleanup of blenkernel last weeks , caused the house of cards to collapse on top of bf_gpu's shader_builder, which is off by default but used on a daily basis by the rendering team. Given the fixes forward in #110394 ran into a ODR violation in OSL that was hiding there for years, I don't see another way forward without impeding the rendering teams productivity for "quite a while" as there is no guarantee the OSL issue would be the end of it. the only way forward appears to be back. this reverts :19422044eda670b53abe0f541db97cbe516e8c813e88a2f44c4e64b772f59547e7a31707fe6c5a57The problematic commit was07fe6c5a57as blenkernel links most of blender, it's a bit of a link order issue magnet. Given all these commits stack, it's near impossible to revert just that one without spending a significant amount of time resolving merge conflicts. 99% of that work was automated, so easier to just revert all of them, and re-do the work, than it is to deal with the merge conflicts. Pull Request: https://projects.blender.org/blender/blender/pulls/110438
102 lines
2.1 KiB
CMake
102 lines
2.1 KiB
CMake
# SPDX-FileCopyrightText: 2023 Blender Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
exporter
|
|
importer
|
|
../common
|
|
../../blenkernel
|
|
../../bmesh
|
|
../../bmesh/intern
|
|
../../depsgraph
|
|
../../editors/include
|
|
../../makesrna
|
|
../../nodes
|
|
../../windowmanager
|
|
)
|
|
|
|
set(INC_SYS
|
|
../../../../extern/fast_float
|
|
../../../../extern/fmtlib/include
|
|
)
|
|
|
|
set(SRC
|
|
IO_wavefront_obj.cc
|
|
exporter/obj_export_file_writer.cc
|
|
exporter/obj_export_mesh.cc
|
|
exporter/obj_export_mtl.cc
|
|
exporter/obj_export_nurbs.cc
|
|
exporter/obj_exporter.cc
|
|
importer/importer_mesh_utils.cc
|
|
importer/obj_import_file_reader.cc
|
|
importer/obj_import_mesh.cc
|
|
importer/obj_import_mtl.cc
|
|
importer/obj_import_nurbs.cc
|
|
importer/obj_import_string_utils.cc
|
|
importer/obj_importer.cc
|
|
|
|
IO_wavefront_obj.h
|
|
exporter/obj_export_file_writer.hh
|
|
exporter/obj_export_io.hh
|
|
exporter/obj_export_mesh.hh
|
|
exporter/obj_export_mtl.hh
|
|
exporter/obj_export_nurbs.hh
|
|
exporter/obj_exporter.hh
|
|
importer/importer_mesh_utils.hh
|
|
importer/obj_import_file_reader.hh
|
|
importer/obj_import_mesh.hh
|
|
importer/obj_import_mtl.hh
|
|
importer/obj_import_nurbs.hh
|
|
importer/obj_import_objects.hh
|
|
importer/obj_import_string_utils.hh
|
|
importer/obj_importer.hh
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenkernel
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::dna
|
|
PRIVATE bf::intern::guardedalloc
|
|
bf_io_common
|
|
extern_fmtlib
|
|
)
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
list(APPEND INC_SYS ${TBB_INCLUDE_DIRS})
|
|
list(APPEND LIB ${TBB_LIBRARIES})
|
|
endif()
|
|
|
|
blender_add_lib(bf_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_SRC
|
|
tests/obj_exporter_tests.cc
|
|
tests/obj_import_string_utils_tests.cc
|
|
tests/obj_importer_tests.cc
|
|
tests/obj_mtl_parser_tests.cc
|
|
|
|
tests/obj_exporter_tests.hh
|
|
)
|
|
|
|
set(TEST_INC
|
|
${INC}
|
|
|
|
../../blenloader
|
|
../../../../tests/gtests
|
|
)
|
|
|
|
set(TEST_LIB
|
|
${LIB}
|
|
|
|
bf_blenloader_tests
|
|
bf_wavefront_obj
|
|
)
|
|
|
|
include(GTestTesting)
|
|
blender_add_test_lib(bf_wavefront_obj_tests "${TEST_SRC}" "${TEST_INC}" "${INC_SYS}" "${TEST_LIB}")
|
|
add_dependencies(bf_wavefront_obj_tests bf_wavefront_obj)
|
|
endif()
|