Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-03-26 04:23:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-03-26 04:24:41 +0300
commit62f5a6bfa713ae99035dbbc82d8bda8860181335 (patch)
tree41b88eede41246457f4e18138e528aa6b3403ae4
parent2f772520862db0ad7edfa614dad0e8d2d65201e2 (diff)
CMake: add headers to source lists, sort file-lists
-rw-r--r--source/blender/blenkernel/CMakeLists.txt5
-rw-r--r--source/blender/blenlib/CMakeLists.txt1
-rw-r--r--source/blender/editors/io/CMakeLists.txt2
-rw-r--r--source/blender/editors/space_spreadsheet/CMakeLists.txt4
-rw-r--r--source/blender/editors/util/CMakeLists.txt2
-rw-r--r--source/blender/gpencil_modifiers/CMakeLists.txt9
-rw-r--r--source/blender/io/gpencil/CMakeLists.txt31
-rw-r--r--source/blender/nodes/CMakeLists.txt2
-rw-r--r--source/blender/sequencer/CMakeLists.txt2
9 files changed, 30 insertions, 28 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 310ac6c4903..5ccaefe6f6f 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -385,6 +385,7 @@ set(SRC
BKE_multires.h
BKE_nla.h
BKE_node.h
+ BKE_node_ui_storage.hh
BKE_object.h
BKE_object_deform.h
BKE_object_facemap.h
@@ -434,10 +435,10 @@ set(SRC
nla_private.h
particle_private.h
tracking_private.h
- intern/attribute_access_intern.hh
intern/CCGSubSurf.h
intern/CCGSubSurf_inline.h
intern/CCGSubSurf_intern.h
+ intern/attribute_access_intern.hh
intern/data_transfer_intern.h
intern/lib_intern.h
intern/multires_inline.h
@@ -742,7 +743,7 @@ if(WITH_GMP)
list(APPEND INC_SYS
${GMP_INCLUDE_DIRS}
)
- endif()
+endif()
# # Warnings as errors, this is too strict!
# if(MSVC)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 37b0f742b8b..d7a27cc4531 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -263,6 +263,7 @@ set(SRC
BLI_session_uuid.h
BLI_set.hh
BLI_set_slots.hh
+ BLI_simd.h
BLI_smallhash.h
BLI_sort.h
BLI_sort_utils.h
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index d45c7ca9b75..44b5f85050f 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -40,8 +40,8 @@ set(SRC
io_alembic.c
io_cache.c
io_collada.c
- io_gpencil_import.c
io_gpencil_export.c
+ io_gpencil_import.c
io_gpencil_utils.c
io_ops.c
io_usd.c
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index a77e74ffd93..1343ab8d851 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -17,9 +17,9 @@
set(INC
../include
+ ../../blenfont
../../blenkernel
../../blenlib
- ../../blenfont
../../bmesh
../../depsgraph
../../functions
@@ -38,8 +38,8 @@ set(SRC
spreadsheet_from_geometry.cc
spreadsheet_ops.cc
- spreadsheet_draw.hh
spreadsheet_column_layout.hh
+ spreadsheet_draw.hh
spreadsheet_from_geometry.hh
spreadsheet_intern.hh
)
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 7d7d10004a3..cf2b6ee19d5 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -18,10 +18,10 @@
set(INC
../include
../space_sequencer
+ ../../blenfont
../../blenkernel
../../blenlib
../../blentranslation
- ../../blenfont
../../bmesh
../../depsgraph
../../gpu
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index e3bb0d773a2..9690f47c862 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -53,8 +53,8 @@ set(SRC
intern/MOD_gpencilbuild.c
intern/MOD_gpencilcolor.c
intern/MOD_gpencilhook.c
- intern/MOD_gpencillineart.c
intern/MOD_gpencillattice.c
+ intern/MOD_gpencillineart.c
intern/MOD_gpencilmirror.c
intern/MOD_gpencilmultiply.c
intern/MOD_gpencilnoise.c
@@ -68,18 +68,19 @@ set(SRC
intern/MOD_gpenciltime.c
intern/MOD_gpenciltint.c
+ MOD_gpencil_lineart.h
MOD_gpencil_modifiertypes.h
intern/MOD_gpencil_ui_common.h
intern/MOD_gpencil_util.h
# Lineart code
- intern/lineart/lineart_ops.c
- intern/lineart/lineart_cpu.c
intern/lineart/lineart_chain.c
+ intern/lineart/lineart_cpu.c
+ intern/lineart/lineart_ops.c
intern/lineart/lineart_util.c
- intern/lineart/lineart_intern.h
intern/lineart/MOD_lineart.h
+ intern/lineart/lineart_intern.h
)
diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index 11c9affbe5a..a41bc3e1155 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -39,22 +39,19 @@ set(INC_SYS
)
set(SRC
- intern/gpencil_io_capi.cc
+ intern/gpencil_io_capi.cc
+ intern/gpencil_io_base.cc
+ intern/gpencil_io_import_base.cc
+ intern/gpencil_io_import_svg.cc
- # This line must be removed if NanoSVG is moved to extern
- nanosvg/nanosvg.h
+ # This line must be removed if NanoSVG is moved to extern
+ nanosvg/nanosvg.h
- gpencil_io.h
-
- intern/gpencil_io_base.h
- intern/gpencil_io_base.cc
-
- intern/gpencil_io_import_base.h
- intern/gpencil_io_import_svg.h
- intern/gpencil_io_import_base.cc
- intern/gpencil_io_import_svg.cc
-
- intern/gpencil_io_export_base.h
+ gpencil_io.h
+ intern/gpencil_io_base.h
+ intern/gpencil_io_export_base.h
+ intern/gpencil_io_import_base.h
+ intern/gpencil_io_import_svg.h
)
set(LIB
@@ -65,8 +62,9 @@ set(LIB
if(WITH_PUGIXML)
list(APPEND SRC
- intern/gpencil_io_export_svg.h
intern/gpencil_io_export_svg.cc
+
+ intern/gpencil_io_export_svg.h
)
list(APPEND INC_SYS
${PUGIXML_INCLUDE_DIR}
@@ -79,8 +77,9 @@ endif()
if(WITH_HARU)
list(APPEND SRC
- intern/gpencil_io_export_pdf.h
intern/gpencil_io_export_pdf.cc
+
+ intern/gpencil_io_export_pdf.h
)
list(APPEND INC_SYS
${HARU_INCLUDE_DIRS}
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 271f4e5c5e4..35b84153a84 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -148,10 +148,10 @@ set(SRC
geometry/nodes/node_geo_attribute_mix.cc
geometry/nodes/node_geo_attribute_proximity.cc
geometry/nodes/node_geo_attribute_randomize.cc
+ geometry/nodes/node_geo_attribute_remove.cc
geometry/nodes/node_geo_attribute_sample_texture.cc
geometry/nodes/node_geo_attribute_separate_xyz.cc
geometry/nodes/node_geo_attribute_vector_math.cc
- geometry/nodes/node_geo_attribute_remove.cc
geometry/nodes/node_geo_boolean.cc
geometry/nodes/node_geo_collection_info.cc
geometry/nodes/node_geo_common.cc
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 9d9553ed858..2b402b4750f 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -72,9 +72,9 @@ set(SRC
intern/multiview.h
intern/prefetch.c
intern/prefetch.h
- intern/proxy_job.c
intern/proxy.c
intern/proxy.h
+ intern/proxy_job.c
intern/render.c
intern/render.h
intern/sequencer.c