From a56200c1ed894bbea1260c6426144c127dd5fdc7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 Aug 2023 11:38:41 +1000 Subject: [PATCH] Cleanup: sort cmake file lists --- source/blender/CMakeLists.txt | 2 +- source/blender/compositor/CMakeLists.txt | 4 ++-- source/blender/editors/geometry/CMakeLists.txt | 2 +- source/blender/editors/gpencil_legacy/CMakeLists.txt | 2 +- source/blender/editors/space_buttons/CMakeLists.txt | 2 +- source/blender/editors/space_outliner/CMakeLists.txt | 6 +++--- source/blender/editors/space_view3d/CMakeLists.txt | 4 ++-- source/blender/editors/util/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 4 ++-- source/blender/io/collada/CMakeLists.txt | 2 +- source/blender/io/usd/CMakeLists.txt | 8 ++++---- source/blender/makesrna/intern/CMakeLists.txt | 2 +- source/blender/nodes/texture/CMakeLists.txt | 2 +- source/blender/render/hydra/CMakeLists.txt | 8 ++++---- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index e92e148abb5..b6aa0d1d8b8 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -52,8 +52,8 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_tree_interface_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 0b4fb47b815..4b7bcda220e 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -346,9 +346,9 @@ if(WITH_COMPOSITOR_CPU) operations/COM_GaussianYBlurOperation.cc operations/COM_GaussianYBlurOperation.h operations/COM_KuwaharaAnisotropicOperation.cc - operations/COM_KuwaharaAnisotropicStructureTensorOperation.h - operations/COM_KuwaharaAnisotropicStructureTensorOperation.cc operations/COM_KuwaharaAnisotropicOperation.h + operations/COM_KuwaharaAnisotropicStructureTensorOperation.cc + operations/COM_KuwaharaAnisotropicStructureTensorOperation.h operations/COM_KuwaharaClassicOperation.cc operations/COM_KuwaharaClassicOperation.h operations/COM_MovieClipAttributeOperation.cc diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt index a2895337ef3..3d339a5652d 100644 --- a/source/blender/editors/geometry/CMakeLists.txt +++ b/source/blender/editors/geometry/CMakeLists.txt @@ -7,12 +7,12 @@ set(INC ../../asset_system ../../blenkernel ../../blentranslation + ../../bmesh ../../depsgraph ../../functions ../../makesrna ../../nodes ../../windowmanager - ../../bmesh # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt index cedf490857b..a458caada2b 100644 --- a/source/blender/editors/gpencil_legacy/CMakeLists.txt +++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt @@ -7,12 +7,12 @@ set(INC ../../blenfont ../../blenkernel ../../blentranslation + ../../bmesh ../../depsgraph ../../gpu ../../imbuf ../../makesrna ../../windowmanager - ../../bmesh # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna ) diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index e1ffafb01b2..a561a66c880 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -7,10 +7,10 @@ set(INC ../../blenkernel ../../blenloader ../../blentranslation + ../../bmesh ../../gpu ../../makesrna ../../windowmanager - ../../bmesh # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 897a9dd1d8a..70f0eec408f 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -73,8 +73,8 @@ set(SRC tree/tree_element_label.cc tree/tree_element_layer_collection.cc tree/tree_element_linked_object.cc - tree/tree_element_nla.cc tree/tree_element_modifier.cc + tree/tree_element_nla.cc tree/tree_element_overrides.cc tree/tree_element_particle_system.cc tree/tree_element_pose.cc @@ -96,13 +96,13 @@ set(SRC tree/tree_element_defgroup.hh tree/tree_element_driver.hh tree/tree_element_edit_bone.hh + tree/tree_element_gpencil_effect.hh tree/tree_element_gpencil_layer.hh tree/tree_element_grease_pencil_node.hh tree/tree_element_id.hh tree/tree_element_id_armature.hh tree/tree_element_id_collection.hh tree/tree_element_id_curve.hh - tree/tree_element_gpencil_effect.hh tree/tree_element_id_gpencil_legacy.hh tree/tree_element_id_grease_pencil.hh tree/tree_element_id_library.hh @@ -115,8 +115,8 @@ set(SRC tree/tree_element_label.hh tree/tree_element_layer_collection.hh tree/tree_element_linked_object.hh - tree/tree_element_nla.hh tree/tree_element_modifier.hh + tree/tree_element_nla.hh tree/tree_element_overrides.hh tree/tree_element_particle_system.hh tree/tree_element_pose.hh diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 8bd7e0530cf..3a84d6e6b71 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -3,8 +3,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(INC - ../include ../asset + ../include ../../asset_system ../../blenfont ../../blenkernel @@ -60,9 +60,9 @@ set(SRC view3d_navigate_view_move.cc view3d_navigate_view_ndof.cc view3d_navigate_view_orbit.cc + view3d_navigate_view_pan.cc view3d_navigate_view_roll.cc view3d_navigate_view_rotate.cc - view3d_navigate_view_pan.cc view3d_navigate_view_zoom.cc view3d_navigate_walk.cc view3d_navigate_zoom_border.cc diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index ee0d4d962d0..6d801f08667 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -64,8 +64,8 @@ set(SRC ../include/ED_mask.hh ../include/ED_mball.hh ../include/ED_mesh.hh - ../include/ED_node_c.hh ../include/ED_node.hh + ../include/ED_node_c.hh ../include/ED_node_preview.hh ../include/ED_numinput.hh ../include/ED_object.hh diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 45d1f7c7110..90cd321edfe 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -4,8 +4,8 @@ set(INC . - intern dummy + intern metal opengl vulkan @@ -656,8 +656,8 @@ set(SRC_SHADER_CREATE_INFOS ../draw/engines/eevee_next/shaders/infos/eevee_motion_blur_info.hh ../draw/engines/eevee_next/shaders/infos/eevee_reflection_probe_info.hh ../draw/engines/eevee_next/shaders/infos/eevee_shadow_info.hh - ../draw/engines/eevee_next/shaders/infos/eevee_tracing_info.hh ../draw/engines/eevee_next/shaders/infos/eevee_subsurface_info.hh + ../draw/engines/eevee_next/shaders/infos/eevee_tracing_info.hh ../draw/engines/eevee_next/shaders/infos/eevee_velocity_info.hh ../draw/engines/eevee_next/shaders/infos/eevee_volume_info.hh ../draw/engines/gpencil/shaders/infos/gpencil_info.hh diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 01716580bbb..cd6ab7295a4 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -25,10 +25,10 @@ set(INC ../../blentranslation ../../depsgraph ../../editors/include + ../../ikplugin ../../imbuf ../../makesrna ../../windowmanager - ../../ikplugin ../../../../intern/iksolver/extern ../../bmesh ) diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index a4c867bac8c..0806cd35510 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -68,8 +68,8 @@ set(INC ../../nodes ../../python/intern ../../windowmanager - ../../../../intern/utfconv ../../../../intern/clog + ../../../../intern/utfconv # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -107,14 +107,14 @@ set(SRC intern/usd_reader_nurbs.cc intern/usd_reader_prim.cc intern/usd_reader_shape.cc + intern/usd_reader_skeleton.cc intern/usd_reader_stage.cc intern/usd_reader_volume.cc intern/usd_reader_xform.cc - intern/usd_reader_skeleton.cc intern/usd_skel_convert.cc - usd.hh usd.h + usd.hh intern/usd_asset_utils.h intern/usd_exporter_context.h @@ -141,10 +141,10 @@ set(SRC intern/usd_reader_nurbs.h intern/usd_reader_prim.h intern/usd_reader_shape.h + intern/usd_reader_skeleton.h intern/usd_reader_stage.h intern/usd_reader_volume.h intern/usd_reader_xform.h - intern/usd_reader_skeleton.h intern/usd_skel_convert.h ) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index be59ce5ec8d..ff088201e39 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -63,9 +63,9 @@ set(DEFSRC rna_modifier.cc rna_movieclip.cc rna_nla.cc - rna_nodetree.cc rna_node_socket.cc rna_node_tree_interface.cc + rna_nodetree.cc rna_object.cc rna_object_force.cc rna_packedfile.cc diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index e96750390a3..f8b8ae8c2f6 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -9,12 +9,12 @@ set(INC ../../editors/include ../../blenkernel ../../blentranslation + ../../bmesh ../../depsgraph ../../imbuf ../../makesrna ../../render ../../windowmanager - ../../bmesh # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna ) diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt index 0c5cee7975a..eea46d6720e 100644 --- a/source/blender/render/hydra/CMakeLists.txt +++ b/source/blender/render/hydra/CMakeLists.txt @@ -38,13 +38,13 @@ endif() set(INC ../../../../intern/clog ../../../../intern/guardedalloc + ../../blenkernel + ../../blenlib + ../../depsgraph + ../../imbuf ../../makesdna ../../makesrna ../../nodes - ../../blenlib - ../../depsgraph - ../../blenkernel - ../../imbuf ../../io/usd ../../gpu ../../gpu/intern