[Bf-blender-cvs] [4b8b7c821d4] blender2.7: Cleanup: sort cmake file lists

Campbell Barton noreply at git.blender.org
Thu Jan 24 22:50:54 CET 2019


Commit: 4b8b7c821d46528abd7bf809b1cbc5c44a44796c
Author: Campbell Barton
Date:   Fri Jan 25 08:30:33 2019 +1100
Branches: blender2.7
https://developer.blender.org/rB4b8b7c821d46528abd7bf809b1cbc5c44a44796c

Cleanup: sort cmake file lists

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

M	intern/ghost/CMakeLists.txt
M	source/blender/CMakeLists.txt
M	source/blender/alembic/CMakeLists.txt
M	source/blender/avi/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/bmesh/CMakeLists.txt
M	source/blender/collada/CMakeLists.txt
M	source/blender/compositor/CMakeLists.txt
M	source/blender/editors/armature/CMakeLists.txt
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/sculpt_paint/CMakeLists.txt
M	source/blender/editors/space_clip/CMakeLists.txt
M	source/blender/editors/space_info/CMakeLists.txt
M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/imbuf/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt
M	source/blender/physics/CMakeLists.txt
M	source/blender/render/CMakeLists.txt
M	source/gameengine/Expressions/CMakeLists.txt
M	source/gameengine/Ketsji/CMakeLists.txt
M	source/gameengine/Physics/Bullet/CMakeLists.txt
M	source/gameengine/Rasterizer/CMakeLists.txt
M	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
M	source/gameengine/VideoTexture/CMakeLists.txt

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

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 1af0defc4ed..546642a53ba 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -122,15 +122,15 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 		add_definitions(-DWITH_HEADLESS)
 	else()
 		list(APPEND SRC
+			intern/GHOST_ContextSDL.cpp
 			intern/GHOST_DisplayManagerSDL.cpp
 			intern/GHOST_SystemSDL.cpp
 			intern/GHOST_WindowSDL.cpp
-			intern/GHOST_ContextSDL.cpp
 
+			intern/GHOST_ContextSDL.h
 			intern/GHOST_DisplayManagerSDL.h
 			intern/GHOST_SystemSDL.h
 			intern/GHOST_WindowSDL.h
-			intern/GHOST_ContextSDL.h
 		)
 		add_definitions(-DWITH_GHOST_SDL)
 	endif()
@@ -176,13 +176,13 @@ elseif(WITH_X11)
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
 		intern/GHOST_SystemX11.cpp
-		intern/GHOST_WindowX11.cpp
 		intern/GHOST_TaskbarX11.cpp
+		intern/GHOST_WindowX11.cpp
 
 		intern/GHOST_DisplayManagerX11.h
 		intern/GHOST_SystemX11.h
-		intern/GHOST_WindowX11.h
 		intern/GHOST_TaskbarX11.h
+		intern/GHOST_WindowX11.h
 	)
 
 	if(NOT WITH_GL_EGL)
@@ -265,15 +265,15 @@ elseif(WIN32)
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
+		intern/GHOST_DropTargetWin32.cpp
 		intern/GHOST_SystemWin32.cpp
 		intern/GHOST_WindowWin32.cpp
-		intern/GHOST_DropTargetWin32.cpp
 
 		intern/GHOST_DisplayManagerWin32.h
 		intern/GHOST_DropTargetWin32.h
 		intern/GHOST_SystemWin32.h
-		intern/GHOST_WindowWin32.h
 		intern/GHOST_TaskbarWin32.h
+		intern/GHOST_WindowWin32.h
 	)
 
 	if(NOT WITH_GL_EGL)
@@ -313,8 +313,8 @@ endif()
 
 if(APPLE)
 	list(APPEND SRC
-		intern/GHOST_SystemPathsCocoa.mm
 		intern/GHOST_SystemPathsCocoa.h
+		intern/GHOST_SystemPathsCocoa.mm
 	)
 
 elseif(UNIX)
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 690e1bcf318..d14f3d67037 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -56,16 +56,18 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meta_types.h
 	${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_object_enums.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_packedFile_types.h
@@ -83,6 +85,7 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_speaker_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_text_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h
+	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vec_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vfont_types.h
@@ -90,9 +93,6 @@ set(SRC_DNA_INC
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
 	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h
-	${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
 )
 
 add_subdirectory(datatoc)
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/alembic/CMakeLists.txt
index fb08887c076..f43bbea64b7 100644
--- a/source/blender/alembic/CMakeLists.txt
+++ b/source/blender/alembic/CMakeLists.txt
@@ -48,8 +48,8 @@ set(INC_SYS
 set(SRC
 	intern/abc_archive.cc
 	intern/abc_camera.cc
-	intern/abc_customdata.cc
 	intern/abc_curves.cc
+	intern/abc_customdata.cc
 	intern/abc_exporter.cc
 	intern/abc_hair.cc
 	intern/abc_mball.cc
@@ -64,8 +64,8 @@ set(SRC
 	ABC_alembic.h
 	intern/abc_archive.h
 	intern/abc_camera.h
-	intern/abc_customdata.h
 	intern/abc_curves.h
+	intern/abc_customdata.h
 	intern/abc_exporter.h
 	intern/abc_hair.h
 	intern/abc_mball.h
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index d019863faa5..477ee73d833 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -36,18 +36,18 @@ set(INC_SYS
 
 set(SRC
 	intern/avi.c
-	intern/avi_rgb.c
 	intern/avi_codecs.c
 	intern/avi_endian.c
 	intern/avi_mjpeg.c
 	intern/avi_options.c
+	intern/avi_rgb.c
 	intern/avi_rgb32.c
 
 	AVI_avi.h
-	intern/avi_intern.h
-	intern/avi_rgb.h
 	intern/avi_endian.h
+	intern/avi_intern.h
 	intern/avi_mjpeg.h
+	intern/avi_rgb.h
 	intern/avi_rgb32.h
 )
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 45f2ac083dd..3b6a428f413 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -307,13 +307,13 @@ set(SRC
 
 	depsgraph_private.h
 	nla_private.h
-	tracking_private.h
 	particle_private.h
+	tracking_private.h
 	intern/CCGSubSurf.h
 	intern/CCGSubSurf_inline.h
 	intern/CCGSubSurf_intern.h
-	intern/pbvh_intern.h
 	intern/data_transfer_intern.h
+	intern/pbvh_intern.h
 )
 
 if(WITH_BINRELOC)
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index bd3eb4cc1ac..f8ab8aafdc7 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -87,10 +87,10 @@ set(SRC
 	intern/bmesh_construct.h
 	intern/bmesh_core.c
 	intern/bmesh_core.h
-	intern/bmesh_edgeloop.c
-	intern/bmesh_edgeloop.h
 	intern/bmesh_delete.c
 	intern/bmesh_delete.h
+	intern/bmesh_edgeloop.c
+	intern/bmesh_edgeloop.h
 	intern/bmesh_inline.h
 	intern/bmesh_interp.c
 	intern/bmesh_interp.h
@@ -130,8 +130,8 @@ set(SRC
 	intern/bmesh_walkers_impl.c
 	intern/bmesh_walkers_private.h
 
-	intern/bmesh_operator_api.h
 	intern/bmesh_error.h
+	intern/bmesh_operator_api.h
 
 	tools/bmesh_beautify.c
 	tools/bmesh_beautify.h
@@ -139,10 +139,10 @@ set(SRC
 	tools/bmesh_bevel.h
 	tools/bmesh_bisect_plane.c
 	tools/bmesh_bisect_plane.h
+	tools/bmesh_decimate.h
 	tools/bmesh_decimate_collapse.c
 	tools/bmesh_decimate_dissolve.c
 	tools/bmesh_decimate_unsubdivide.c
-	tools/bmesh_decimate.h
 	tools/bmesh_edgenet.c
 	tools/bmesh_edgenet.h
 	tools/bmesh_edgesplit.c
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index fd38998c98c..3a0c9dcf50c 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -60,8 +60,8 @@ set(INC_SYS
 )
 
 set(SRC
-	AnimationImporter.cpp
 	AnimationExporter.cpp
+	AnimationImporter.cpp
 	ArmatureExporter.cpp
 	ArmatureImporter.cpp
 	CameraExporter.cpp
@@ -71,25 +71,25 @@ set(SRC
 	EffectExporter.cpp
 	ErrorHandler.cpp
 	ExportSettings.cpp
-	ImportSettings.cpp
 	ExtraHandler.cpp
 	ExtraTags.cpp
 	GeometryExporter.cpp
 	ImageExporter.cpp
+	ImportSettings.cpp
 	InstanceWriter.cpp
 	LightExporter.cpp
 	MaterialExporter.cpp
 	MeshImporter.cpp
-	SkinInfo.cpp
 	SceneExporter.cpp
+	SkinInfo.cpp
 	TransformReader.cpp
 	TransformWriter.cpp
 	collada.cpp
 	collada_internal.cpp
 	collada_utils.cpp
 
-	AnimationImporter.h
 	AnimationExporter.h
+	AnimationImporter.h
 	ArmatureExporter.h
 	ArmatureImporter.h
 	CameraExporter.h
@@ -99,17 +99,17 @@ set(SRC
 	EffectExporter.h
 	ErrorHandler.h
 	ExportSettings.h
-	ImportSettings.h
 	ExtraHandler.h
 	ExtraTags.h
 	GeometryExporter.h
 	ImageExporter.h
+	ImportSettings.h
 	InstanceWriter.h
 	LightExporter.h
 	MaterialExporter.h
 	MeshImporter.h
-	SkinInfo.h
 	SceneExporter.h
+	SkinInfo.h
 	TransformReader.h
 	TransformWriter.h
 	collada.h
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 0ad53d3ab80..becad00b647 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -53,126 +53,126 @@ set(SRC
 	COM_compositor.h
 	COM_defines.h
 
-	intern/COM_compositor.cpp
-	intern/COM_ExecutionSystem.cpp
-	intern/COM_ExecutionSystem.h
-	intern/COM_NodeConverter.cpp
-	intern/COM_NodeConverter.h
-	intern/COM_NodeOperationBuilder.cpp
-	intern/COM_NodeOperationBuilder.h
-	intern/COM_NodeGraph.cpp
-	intern/COM_NodeGraph.h
+	intern/COM_CPUDevice.cpp
+	intern/COM_CPUDevice.h
+	intern/COM_ChunkOrder.cpp
+	intern/COM_ChunkOrder.h
+	intern/COM_ChunkOrderHotspot.cpp
+	intern/COM_ChunkOrderHotspot.h
+	intern/COM_CompositorContext.cpp
+	intern/COM_CompositorContext.h
 	intern/COM_Converter.cpp
 	intern/COM_Converter.h
+	intern/COM_Debug.cpp
+	intern/COM_Debug.h
+	intern/COM_Device.cpp
+	intern/COM_Device.h
 	intern/COM_ExecutionGroup.cpp
 	intern/COM_ExecutionGroup.h
+	intern/COM_ExecutionSystem.cpp
+	intern/COM_ExecutionSystem.h
+	intern/COM_MemoryBuffer.cpp
+	intern/COM_MemoryBuffer.h
+	intern/COM_MemoryProxy.cpp
+	intern/COM_MemoryProxy.h
 	intern/COM_Node.cpp
 	intern/COM_Node.h
+	intern/COM_NodeConverter.cpp
+	intern/COM_NodeConverter.h
+	intern/COM_NodeGraph.cpp
+	intern/COM_NodeGraph.h
 	intern/COM_NodeOperation.cpp
 	intern/COM_NodeOperation.h
-	intern/COM_SocketReader.cpp
-	intern/COM_SocketReader.h
-	intern/COM_MemoryProxy.cpp
-	intern/COM_MemoryProxy.h
-	intern/COM_MemoryBuffer.cpp
-	intern/COM_MemoryBuffer.h
-	intern/COM_WorkScheduler.cpp
-	intern/COM_WorkScheduler.h
-	intern/COM_WorkPackage.cpp
-	intern/COM_WorkPackage.h
-	intern/COM_ChunkOrder.cpp
-	intern/COM_ChunkOrder.h
-	intern/COM_ChunkOrderHotspot.cpp
-	intern/COM_ChunkOrderHotspot.h
-	intern/COM_Device.cpp
-	intern/COM_Device.h
-	intern/COM_CPUDevice.cpp
-	intern/COM_CPUDevice.h
+	intern/COM_NodeOperationBuilder.cpp
+	intern/COM_NodeOperationBuilder.h
 	intern/COM_OpenCLDevice.cpp
 	intern/COM_OpenCLDevice.h
-	intern/COM_CompositorContext.cpp
-	intern/COM_Compo

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list