Cleanup: strip trailing space, sort file lists

This commit is contained in:
Campbell Barton
2025-02-16 20:42:16 +11:00
parent 4c5424d9fc
commit 5087246f39
6 changed files with 10 additions and 11 deletions

View File

@@ -19,7 +19,7 @@ ExternalProject_Add(external_nanobind
URL_HASH ${NANOBIND_HASH_TYPE}=${NANOBIND_HASH}
PREFIX ${BUILD_DIR}/nanobind
CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
PATCH_COMMAND ${NANOBIND_PATCH}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/nanobind

View File

@@ -316,4 +316,3 @@ def bake_data_animation(blender_type_data, blender_id, animation_key, slot_ident
if animation is not None and animation.channels:
link_samplers(animation, export_settings)
return animation

View File

@@ -90,8 +90,8 @@ set(SRC
intern/gpu_shader_log.cc
intern/gpu_state.cc
intern/gpu_storage_buffer.cc
intern/gpu_texture_pool.cc
intern/gpu_texture.cc
intern/gpu_texture_pool.cc
intern/gpu_uniform_buffer.cc
intern/gpu_vertex_buffer.cc
intern/gpu_vertex_format.cc
@@ -123,8 +123,8 @@ set(SRC
GPU_shader_shared.hh
GPU_state.hh
GPU_storage_buffer.hh
GPU_texture_pool.hh
GPU_texture.hh
GPU_texture_pool.hh
GPU_uniform_buffer.hh
GPU_vertex_buffer.hh
GPU_vertex_format.hh

View File

@@ -18,17 +18,17 @@ set(SRC
intern/object_identifier.cc
intern/orientation.cc
intern/path_util.cc
intern/subdiv_disabler.cc
intern/string_utils.cc
intern/subdiv_disabler.cc
IO_abstract_hierarchy_iterator.h
IO_dupli_persistent_id.hh
IO_orientation.hh
IO_path_util.hh
IO_path_util_types.hh
IO_string_utils.hh
IO_subdiv_disabler.hh
IO_types.hh
IO_string_utils.hh
intern/dupli_parent_finder.hh
)

View File

@@ -12,8 +12,8 @@ set(INC
../../modifiers
../../io/common
../../io/csv
../../io/stl
../../io/ply
../../io/stl
../../io/wavefront_obj
# RNA_prototypes.hh
${CMAKE_BINARY_DIR}/source/blender/makesrna

View File

@@ -824,7 +824,7 @@ else()
add_blender_test(
compositor_cpu_file_output
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--
--testdir "${TEST_SRC_DIR}/compositor/file_output/"
--outdir "${TEST_OUT_DIR}/compositor_cpu/file_output"
@@ -864,7 +864,7 @@ if(WITH_GPU_COMPOSITOR_TESTS)
endforeach()
add_blender_test(
compositor_opengl_file_output
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--
--testdir "${TEST_SRC_DIR}/compositor/file_output/"
--outdir "${TEST_OUT_DIR}/compositor_opengl/file_output"
@@ -883,7 +883,7 @@ if(WITH_GPU_COMPOSITOR_TESTS)
endforeach()
add_blender_test(
compositor_metal_file_output
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--
--testdir "${TEST_SRC_DIR}/compositor/file_output/"
--outdir "${TEST_OUT_DIR}/compositor_metal/file_output"
@@ -902,7 +902,7 @@ if(WITH_GPU_COMPOSITOR_TESTS)
endforeach()
add_blender_test(
compositor_vulkan_file_output
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--python ${CMAKE_CURRENT_LIST_DIR}/compositor_file_output_tests.py
--
--testdir "${TEST_SRC_DIR}/compositor/file_output/"
--outdir "${TEST_OUT_DIR}/compositor_vulkan/file_output"