[Bf-blender-cvs] [0d7e0ffdb56] master: Cleanup: tabs to spaces for CMake files & sort file-lists

Campbell Barton noreply at git.blender.org
Tue May 31 10:19:29 CEST 2022


Commit: 0d7e0ffdb56c28fa78a17f517f2d006bbd1f42bf
Author: Campbell Barton
Date:   Tue May 31 18:14:51 2022 +1000
Branches: master
https://developer.blender.org/rB0d7e0ffdb56c28fa78a17f517f2d006bbd1f42bf

Cleanup: tabs to spaces for CMake files & sort file-lists

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

M	source/blender/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/editors/space_image/CMakeLists.txt
M	source/blender/imbuf/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/python/intern/CMakeLists.txt
M	source/blender/python/mathutils/CMakeLists.txt

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

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index efa2be9e48c..8ba6e7318bb 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -96,15 +96,15 @@ set(SRC_DNA_DEFAULTS_INC
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_cachefile_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_camera_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_collection_defaults.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curves_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curve_defaults.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curves_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fluid_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_modifier_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_image_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_defaults.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_light_defaults.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_defaults.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_defaults.h
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 0b5f252b0d6..8399bc6c144 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -611,7 +611,7 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_IMAGE_WEBP)
-	add_definitions(-DWITH_WEBP)
+  add_definitions(-DWITH_WEBP)
 endif()
 
 if(WITH_CODEC_AVI)
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 3381dbadbab..d2a89576022 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -141,8 +141,8 @@ set(SRC
   engines/eevee_next/eevee_pipeline.cc
   engines/eevee_next/eevee_shader.cc
   engines/eevee_next/eevee_sync.cc
-  engines/eevee_next/eevee_view.cc
   engines/eevee_next/eevee_velocity.cc
+  engines/eevee_next/eevee_view.cc
   engines/eevee_next/eevee_world.cc
   engines/workbench/workbench_data.c
   engines/workbench/workbench_effect_antialiasing.c
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index c385420b18e..39fb41245bf 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -61,7 +61,7 @@ if(WITH_IMAGE_CINEON)
 endif()
 
 if(WITH_IMAGE_WEBP)
-	add_definitions(-DWITH_WEBP)
+  add_definitions(-DWITH_WEBP)
 endif()
 
 blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index e46326467cc..1309e3810be 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -178,13 +178,13 @@ if(WITH_IMAGE_WEBP)
   list(APPEND SRC
     intern/webp.c
   )
-	list(APPEND INC_SYS
-		${WEBP_INCLUDE_DIRS}
-	)
+  list(APPEND INC_SYS
+    ${WEBP_INCLUDE_DIRS}
+  )
   list(APPEND LIB
     ${WEBP_LIBRARIES}
   )
-	add_definitions(-DWITH_WEBP)
+  add_definitions(-DWITH_WEBP)
 endif()
 
 list(APPEND INC
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9980545c19d..af8767a1220 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -237,7 +237,7 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_IMAGE_WEBP)
-	add_definitions(-DWITH_WEBP)
+  add_definitions(-DWITH_WEBP)
 endif()
 
 if(WITH_AUDASPACE)
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 959fbc7ee98..8179daa8e03 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -232,7 +232,7 @@ if(WITH_IMAGE_TIFF)
 endif()
 
 if(WITH_WEBP)
-	add_definitions(-DWITH_WEBP)
+  add_definitions(-DWITH_WEBP)
 endif()
 
 if(WITH_INPUT_NDOF)
diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt
index 747d6c0e8f8..f355d03cadc 100644
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -4,9 +4,9 @@ set(INC
   .
   ../../blenkernel
   ../../blenlib
-  ../../imbuf
   ../../bmesh
   ../../depsgraph
+  ../../imbuf
   ../../makesdna
   ../../../../intern/guardedalloc
 )



More information about the Bf-blender-cvs mailing list