Commit: 2218bf02dd4f4f83a5eabbc34103a1c301bcbe7b
Author: Campbell Barton
Date: Fri Jan 25 08:30:33 2019 +1100
Branches: master
https://developer.blender.org/rB2218bf02dd4f4f83a5eabbc34103a1c301bcbe7b
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/draw/CMakeLists.txt
M source/blender/editors/armature/CMakeLists.txt
M source/blender/editors/gpencil/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_node/CMakeLists.txt
M source/blender/editors/space_view3d/CMakeLists.txt
M source/blender/freestyle/CMakeLists.txt
M source/blender/gpencil_modifiers/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/python/intern/CMakeLists.txt
M source/blender/render/CMakeLists.txt
M source/blender/shader_fx/CMakeLists.txt
===================================================================
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index d8330d43c16..0b651b2cd6e 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -123,15 +123,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()
@@ -177,13 +177,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)
@@ -266,15 +266,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)
@@ -314,8 +314,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 a4d8e21c349..4b46e3e9633 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -59,8 +59,8 @@ set(SRC_DNA_INC
${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_meshdata_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
diff --git a/source/blender/alembic/CMakeLists.txt
b/source/blender/alembic/CMakeLists.txt
index d3b5e189292..88dbe1d7439 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 00b64379647..1143394cb49 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -131,11 +131,14 @@ set(SRC
intern/keyconfig.c
intern/lamp.c
intern/lattice.c
+ intern/layer.c
+ intern/layer_utils.c
intern/library.c
intern/library_idmap.c
intern/library_override.c
intern/library_query.c
intern/library_remap.c
+ intern/lightprobe.c
intern/linestyle.c
intern/main.c
intern/mask.c
@@ -162,9 +165,9 @@ set(SRC
intern/nla.c
intern/node.c
intern/object.c
- intern/object_facemap.c
intern/object_deform.c
intern/object_dupli.c
+ intern/object_facemap.c
intern/object_update.c
intern/ocean.c
intern/outliner_treehash.c
@@ -178,9 +181,6 @@ set(SRC
intern/pbvh.c
intern/pbvh_bmesh.c
intern/pointcache.c
- intern/layer.c
- intern/layer_utils.c
- intern/lightprobe.c
intern/report.c
intern/rigidbody.c
intern/scene.c
@@ -284,11 +284,13 @@ set(SRC
BKE_keyconfig.h
BKE_lamp.h
BKE_lattice.h
+ BKE_layer.h
BKE_library.h
BKE_library_idmap.h
BKE_library_override.h
BKE_library_query.h
BKE_library_remap.h
+ BKE_lightprobe.h
BKE_linestyle.h
BKE_main.h
BKE_mask.h
@@ -307,8 +309,8 @@ set(SRC
BKE_nla.h
BKE_node.h
BKE_object.h
- BKE_object_facemap.h
BKE_object_deform.h
+ BKE_object_facemap.h
BKE_ocean.h
BKE_outliner_treehash.h
BKE_packedFile.h
@@ -316,8 +318,6 @@ set(SRC
BKE_particle.h
BKE_pbvh.h
BKE_pointcache.h
- BKE_layer.h
- BKE_lightprobe.h
BKE_report.h
BKE_rigidbody.h
BKE_scene.h
diff --git a/source/blender/bmesh/CMakeLists.txt
b/source/blender/bmesh/CMakeLists.txt
index e6317762842..037d97068eb 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -86,10 +86,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
@@ -129,8 +129,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
@@ -138,10 +138,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 8c2339497bf..3e51c0eb8b3 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -61,15 +61,15 @@ set(INC_SYS
)
set(SRC
- AnimationImporter.cpp
- AnimationExporter.cpp
AnimationClipExporter.cpp
+ AnimationExporter.cpp
+ AnimationImporter.cpp
ArmatureExporter.cpp
ArmatureImporter.cpp
- BlenderContext.cpp
BCAnimationCurve.cpp
BCAnimationSampler.cpp
BCSampleData.cpp
+ BlenderContext.cpp
CameraExporter.cpp
ControllerExporter.cpp
DocumentExporter.cpp
@@ -77,33 +77,33 @@ 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
Materials.cpp
+ MeshImporter.cpp
SceneExporter.cpp
+ SkinInfo.cpp
TransformReader.cpp
TransformWriter.cpp
collada.cpp
collada_internal.cpp
collada_utils.cpp
- AnimationImporter.h
- AnimationExporter.h
AnimationClipExporter.h
+ AnimationExporter.h
+ AnimationImporter.h
ArmatureExporter.h
ArmatureImporter.h
- BlenderContext.h
BCAnimationCurve.h
BCAnimationSampler.h
BCSampleData.h
+ BlenderContext.h
CameraExporter.h
ControllerExporter.h
DocumentExporter.h
@@ -111,18 +111,18 @@ 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
Materials.h
- SkinInfo.h
+ MeshImporter.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 261a1218d2d..1229fddbfae 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -54,126 +54,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.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
