[Bf-blender-cvs] [c3cb5652507] master: CMake: add missing headers, sort file lists

Campbell Barton noreply at git.blender.org
Thu Jul 8 05:26:21 CEST 2021 

Commit: c3cb5652507e5ac309108994a7a6c7587a3be398
Author: Campbell Barton
Date:   Thu Jul 8 13:20:32 2021 +1000
Branches: master
https://developer.blender.org/rBc3cb5652507e5ac309108994a7a6c7587a3be398

CMake: add missing headers, sort file lists

===================================================================

M	intern/ghost/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/compositor/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/editors/space_spreadsheet/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt
M	source/blender/sequencer/CMakeLists.txt

===================================================================

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 6edd7b386da..a35c9fffcab 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -293,6 +293,7 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       intern/GHOST_WindowWayland.cpp
 
       intern/GHOST_SystemWayland.h
+      intern/GHOST_WaylandCursorSettings.h
       intern/GHOST_WindowWayland.h
     )
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f14396f152e..a0aee552759 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -330,7 +330,6 @@ set(SRC
   BKE_customdata_file.h
   BKE_data_transfer.h
   BKE_deform.h
-  BKE_spline.hh
   BKE_displist.h
   BKE_displist_tangent.h
   BKE_duplilist.h
@@ -421,6 +420,7 @@ set(SRC
   BKE_softbody.h
   BKE_sound.h
   BKE_speaker.h
+  BKE_spline.hh
   BKE_studiolight.h
   BKE_subdiv.h
   BKE_subdiv_ccg.h
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 677df9db026..ea5572f1c8a 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -188,6 +188,7 @@ set(SRC
   BLI_dynstr.h
   BLI_easing.h
   BLI_edgehash.h
+  BLI_endian_defines.h
   BLI_endian_switch.h
   BLI_endian_switch_inline.h
   BLI_enumerable_thread_specific.hh
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 61a00ccdaa4..f5baf0dcb83 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -58,8 +58,8 @@ set(SRC
   intern/versioning_280.c
   intern/versioning_290.c
   intern/versioning_300.c
-  intern/versioning_cycles.c
   intern/versioning_common.cc
+  intern/versioning_cycles.c
   intern/versioning_defaults.c
   intern/versioning_dna.c
   intern/versioning_legacy.c
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 08d9be8b90e..20b56ceb55f 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -68,6 +68,7 @@ set(SRC
   intern/COM_Device.cc
   intern/COM_Device.h
   intern/COM_Enums.cc
+  intern/COM_Enums.h
   intern/COM_ExecutionGroup.cc
   intern/COM_ExecutionGroup.h
   intern/COM_ExecutionModel.cc
@@ -446,14 +447,14 @@ set(SRC
   operations/COM_BrightnessOperation.h
   operations/COM_ColorCorrectionOperation.cc
   operations/COM_ColorCorrectionOperation.h
+  operations/COM_ConstantOperation.cc
+  operations/COM_ConstantOperation.h
   operations/COM_GammaOperation.cc
   operations/COM_GammaOperation.h
   operations/COM_MixOperation.cc
   operations/COM_MixOperation.h
   operations/COM_ReadBufferOperation.cc
   operations/COM_ReadBufferOperation.h
-  operations/COM_ConstantOperation.cc
-  operations/COM_ConstantOperation.h
   operations/COM_SetColorOperation.cc
   operations/COM_SetColorOperation.h
   operations/COM_SetValueOperation.cc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 1227f4db8e4..ad154704d2c 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -51,14 +51,14 @@ set(INC
 
 set(SRC
   intern/draw_cache.c
+  intern/draw_cache_extract_mesh.cc
   intern/draw_cache_extract_mesh_extractors.c
   intern/draw_cache_extract_mesh_render_data.c
-  intern/draw_cache_extract_mesh.cc
   intern/mesh_extractors/extract_mesh_ibo_edituv.cc
   intern/mesh_extractors/extract_mesh_ibo_fdots.cc
+  intern/mesh_extractors/extract_mesh_ibo_lines.cc
   intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
   intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc
-  intern/mesh_extractors/extract_mesh_ibo_lines.cc
   intern/mesh_extractors/extract_mesh_ibo_points.cc
   intern/mesh_extractors/extract_mesh_ibo_tris.cc
   intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc
@@ -205,8 +205,8 @@ set(SRC
   intern/draw_manager_profiling.h
   intern/draw_manager_testing.h
   intern/draw_manager_text.h
-  intern/draw_view.h
   intern/draw_shader.h
+  intern/draw_view.h
   intern/smaa_textures.h
   engines/basic/basic_engine.h
   engines/eevee/eevee_engine.h
@@ -515,6 +515,8 @@ if(WITH_GTESTS)
     set(TEST_SRC
       tests/draw_testing.cc
       tests/shaders_test.cc
+
+      tests/draw_testing.hh
     )
     set(TEST_INC
       "../../../intern/ghost/"
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index 9a06447b631..e903feeec1b 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -35,8 +35,8 @@ set(INC
 
 set(SRC
   space_spreadsheet.cc
-  spreadsheet_context.cc
   spreadsheet_column.cc
+  spreadsheet_context.cc
   spreadsheet_data_source.cc
   spreadsheet_data_source_geometry.cc
   spreadsheet_dataset_draw.cc
@@ -47,10 +47,10 @@ set(SRC
   spreadsheet_row_filter.cc
   spreadsheet_row_filter_ui.cc
 
-  spreadsheet_context.hh
   spreadsheet_cell_value.hh
   spreadsheet_column.hh
   spreadsheet_column_values.hh
+  spreadsheet_context.hh
   spreadsheet_data_source.hh
   spreadsheet_data_source_geometry.hh
   spreadsheet_dataset_draw.hh
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index abb7330d292..b7dc3210c41 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -82,8 +82,8 @@ set(SRC
   intern/gpu_select_sample_query.cc
   intern/gpu_shader.cc
   intern/gpu_shader_builtin.c
-  intern/gpu_shader_log.cc
   intern/gpu_shader_interface.cc
+  intern/gpu_shader_log.cc
   intern/gpu_state.cc
   intern/gpu_texture.cc
   intern/gpu_uniform_buffer.cc
@@ -103,8 +103,8 @@ set(SRC
   opengl/gl_index_buffer.cc
   opengl/gl_query.cc
   opengl/gl_shader.cc
-  opengl/gl_shader_log.cc
   opengl/gl_shader_interface.cc
+  opengl/gl_shader_log.cc
   opengl/gl_state.cc
   opengl/gl_texture.cc
   opengl/gl_uniform_buffer.cc
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 9340cfbf03d..e324bc8b407 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -77,9 +77,9 @@ set(SRC
   intern/proxy_job.c
   intern/render.c
   intern/render.h
+  intern/sequence_lookup.c
   intern/sequencer.c
   intern/sequencer.h
-  intern/sequence_lookup.c
   intern/sound.c
   intern/strip_add.c
   intern/strip_edit.c

More information about the Bf-blender-cvs mailing list