diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:14 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:14 +0300 |
commit | 1d2dfc5e9e96917fefe10f4361bb0ad20a93cf6b (patch) | |
tree | 4b323da73451387e28c114845a64cead53d25df9 /source | |
parent | a446c53f168f05b971bf2784aa92b27b60504389 (diff) |
Cleanup: sort cmake file lists
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 12 | ||||
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/scene/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/composite/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/geometry/CMakeLists.txt | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index dee163a9797..deff45d0350 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -19,6 +19,7 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_constraint_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curve_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curveprofile_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curves_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_customdata_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_defs.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_documentation.h @@ -31,7 +32,6 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_modifier_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpu_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curves_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_image_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ipo_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index bb91b2f63f6..8f7ef035557 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -104,8 +104,6 @@ set(SRC intern/crazyspace.c intern/cryptomatte.cc intern/curve.cc - intern/curves.cc - intern/curves_geometry.cc intern/curve_bevel.c intern/curve_bezier.cc intern/curve_catmull_rom.cc @@ -116,6 +114,8 @@ set(SRC intern/curve_nurbs.cc intern/curve_to_mesh_convert.cc intern/curveprofile.cc + intern/curves.cc + intern/curves_geometry.cc intern/customdata.cc intern/customdata_file.c intern/data_transfer.c @@ -157,9 +157,9 @@ set(SRC intern/idtype.c intern/image.cc intern/image_format.cc - intern/image_partial_update.cc intern/image_gen.c intern/image_gpu.cc + intern/image_partial_update.cc intern/image_save.cc intern/ipo.c intern/kelvinlet.c @@ -348,10 +348,10 @@ set(SRC BKE_cryptomatte.h BKE_cryptomatte.hh BKE_curve.h - BKE_curves.h - BKE_curves.hh BKE_curve_to_mesh.hh BKE_curveprofile.h + BKE_curves.h + BKE_curves.hh BKE_customdata.h BKE_customdata_file.h BKE_data_transfer.h @@ -822,9 +822,9 @@ if(WITH_GTESTS) intern/cryptomatte_test.cc intern/curves_geometry_test.cc intern/fcurve_test.cc - intern/image_test.cc intern/idprop_serialize_test.cc intern/image_partial_update_test.cc + intern/image_test.cc intern/lattice_deform_test.cc intern/layer_test.cc intern/lib_id_remapper_test.cc diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index af71c96fc10..647726722b1 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -165,8 +165,8 @@ set(SRC BLI_bitmap.h BLI_bitmap_draw_2d.h BLI_blenlib.h - BLI_boxpack_2d.h BLI_bounds.hh + BLI_boxpack_2d.h BLI_buffer.h BLI_color.hh BLI_compiler_attrs.h @@ -174,8 +174,8 @@ set(SRC BLI_compiler_typecheck.h BLI_console.h BLI_convexhull_2d.h - BLI_cpp_type_make.hh BLI_cpp_type.hh + BLI_cpp_type_make.hh BLI_delaunay_2d.h BLI_dial_2d.h BLI_disjoint_set.hh @@ -235,8 +235,8 @@ set(SRC BLI_map.hh BLI_map_slots.hh BLI_math.h - BLI_math_base.hh BLI_math_base.h + BLI_math_base.hh BLI_math_base_safe.h BLI_math_bits.h BLI_math_boolean.hh diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 5dd26d19e02..38ae9e86585 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -25,10 +25,10 @@ set(INC ../windowmanager ../../../intern/atomic + ../../../intern/clog ../../../intern/glew-mx ../../../intern/guardedalloc ../../../intern/opensubdiv - ../../../intern/clog # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern @@ -221,9 +221,9 @@ set(SRC engines/image/image_partial_updater.hh engines/image/image_private.hh engines/image/image_shader_params.hh + engines/image/image_space.hh engines/image/image_space_image.hh engines/image/image_space_node.hh - engines/image/image_space.hh engines/image/image_texture_info.hh engines/image/image_usage.hh engines/image/image_wrappers.hh diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt index 7f687212066..12043ac2957 100644 --- a/source/blender/editors/scene/CMakeLists.txt +++ b/source/blender/editors/scene/CMakeLists.txt @@ -8,8 +8,8 @@ set(INC ../../depsgraph ../../makesdna ../../makesrna - ../../windowmanager ../../sequencer + ../../windowmanager ) set(INC_SYS diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index eee6e680d70..c422c8c2033 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -13,8 +13,8 @@ set(INC ../../gpu ../../imbuf ../../makesdna - ../../nodes ../../makesrna + ../../nodes ../../render ../../windowmanager ../../../../intern/atomic @@ -38,9 +38,9 @@ set(SRC paint_curve_undo.c paint_hide.c paint_image.cc - paint_image_ops_paint.cc paint_image_2d.c paint_image_2d_curve_mask.cc + paint_image_ops_paint.cc paint_image_proj.c paint_mask.c paint_ops.c diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 190454c8dfe..1840b5447e3 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -12,8 +12,8 @@ endif() set(INC . intern - opengl metal + opengl ../blenkernel ../blenlib ../bmesh @@ -104,12 +104,12 @@ set(SRC GPU_shader.h GPU_shader_shared.h GPU_state.h + GPU_storage_buffer.h GPU_texture.h GPU_uniform_buffer.h GPU_vertex_buffer.h GPU_vertex_format.h GPU_viewport.h - GPU_storage_buffer.h intern/gpu_backend.hh intern/gpu_batch_private.hh @@ -426,9 +426,9 @@ set(SRC_SHADER_CREATE_INFOS ../draw/engines/workbench/shaders/infos/workbench_volume_info.hh ../draw/engines/image/shaders/infos/engine_image_info.hh ../draw/intern/shaders/draw_fullscreen_info.hh + ../draw/intern/shaders/draw_hair_refine_info.hh ../draw/intern/shaders/draw_object_infos_info.hh ../draw/intern/shaders/draw_view_info.hh - ../draw/intern/shaders/draw_hair_refine_info.hh shaders/infos/gpu_clip_planes_info.hh shaders/infos/gpu_shader_2D_area_borders_info.hh diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index 681176d8cc4..c34a97f6837 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -17,8 +17,8 @@ set(INC_SYS ) set(SRC - openexr_api.h openexr_api.cpp + openexr_api.h ) set(LIB diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index e507831424f..2afaf04a8d7 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -122,10 +122,10 @@ set(SRC ../DNA_camera_defaults.h ../DNA_collection_defaults.h ../DNA_curve_defaults.h + ../DNA_curves_defaults.h ../DNA_defaults.h ../DNA_fluid_defaults.h ../DNA_gpencil_modifier_defaults.h - ../DNA_curves_defaults.h ../DNA_image_defaults.h ../DNA_lattice_defaults.h ../DNA_light_defaults.h diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index b8bdd9859e0..57f76f20ac6 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -93,9 +93,9 @@ set(SRC nodes/node_composite_scene_time.cc nodes/node_composite_sepcomb_hsva.cc nodes/node_composite_sepcomb_rgba.cc + nodes/node_composite_sepcomb_xyz.cc nodes/node_composite_sepcomb_ycca.cc nodes/node_composite_sepcomb_yuva.cc - nodes/node_composite_sepcomb_xyz.cc nodes/node_composite_setalpha.cc nodes/node_composite_split_viewer.cc nodes/node_composite_stabilize2d.cc diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 5c6c7532a0f..84280c0889a 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -58,9 +58,9 @@ set(SRC nodes/node_geo_curve_to_points.cc nodes/node_geo_curve_trim.cc nodes/node_geo_delete_geometry.cc - nodes/node_geo_duplicate_elements.cc nodes/node_geo_distribute_points_on_faces.cc nodes/node_geo_dual_mesh.cc + nodes/node_geo_duplicate_elements.cc nodes/node_geo_edge_split.cc nodes/node_geo_extrude_mesh.cc nodes/node_geo_field_at_index.cc |