diff options
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/depsgraph/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/simulation/CMakeLists.txt | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index ada341ff570..6f32eb8a90f 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -36,8 +36,8 @@ set(INC ../makesrna ../modifiers ../nodes - ../simulation ../shader_fx + ../simulation ../render/extern/include ../../../intern/ghost ../../../intern/glew-mx @@ -365,8 +365,8 @@ set(SRC BKE_packedFile.h BKE_paint.h BKE_particle.h - BKE_persistent_data_handle.hh BKE_pbvh.h + BKE_persistent_data_handle.hh BKE_pointcache.h BKE_pointcloud.h BKE_report.h @@ -440,9 +440,9 @@ set(LIB bf_intern_opensubdiv # Uses stub when disabled. bf_modifiers bf_nodes - bf_simulation bf_rna bf_shader_fx + bf_simulation ) if(WITH_BINRELOC) diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index c56e0b5ad2e..f5c7223a37c 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -101,8 +101,8 @@ add_dependencies(bf_blenloader bf_dna) if(WITH_GTESTS) set(TEST_SRC - tests/blendfile_loading_base_test.cc tests/blendfile_load_test.cc + tests/blendfile_loading_base_test.cc ) set(TEST_INC ) diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 0eeb0d21b5b..7368e3d044d 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -154,10 +154,10 @@ set(SRC tools/bmesh_path.h tools/bmesh_path_region.c tools/bmesh_path_region.h - tools/bmesh_path_uv.c - tools/bmesh_path_uv.h tools/bmesh_path_region_uv.c tools/bmesh_path_region_uv.h + tools/bmesh_path_uv.c + tools/bmesh_path_uv.h tools/bmesh_region_match.c tools/bmesh_region_match.h tools/bmesh_separate.c diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 417aaa2c4c0..f9a6bde442d 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -106,11 +106,11 @@ set(SRC intern/builder/deg_builder.h intern/builder/deg_builder_cache.h intern/builder/deg_builder_cycle.h - intern/builder/deg_builder_relations_drivers.h intern/builder/deg_builder_map.h intern/builder/deg_builder_nodes.h intern/builder/deg_builder_pchanmap.h intern/builder/deg_builder_relations.h + intern/builder/deg_builder_relations_drivers.h intern/builder/deg_builder_relations_impl.h intern/builder/deg_builder_remove_noop.h intern/builder/deg_builder_rna.h diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 785c1d66407..dce6a7e1c91 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -32,18 +32,18 @@ set(INC_SYS set(SRC bgl.c + bl_math_py_api.c blf_py_api.c bpy_threads.c idprop_py_api.c imbuf_py_api.c - bl_math_py_api.c py_capi_utils.c bgl.h + bl_math_py_api.h blf_py_api.h idprop_py_api.h imbuf_py_api.h - bl_math_py_api.h py_capi_utils.h # header-only diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index cbc6ee65303..e47586d55cc 100644 --- a/source/blender/simulation/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt @@ -45,8 +45,8 @@ set(SRC intern/particle_function.cc intern/particle_mesh_emitter.cc intern/simulation_collect_influences.cc - intern/simulation_solver_influences.cc intern/simulation_solver.cc + intern/simulation_solver_influences.cc intern/simulation_update.cc intern/ConstrainedConjugateGradient.h @@ -56,8 +56,8 @@ set(SRC intern/particle_function.hh intern/particle_mesh_emitter.hh intern/simulation_collect_influences.hh - intern/simulation_solver_influences.hh intern/simulation_solver.hh + intern/simulation_solver_influences.hh intern/time_interval.hh SIM_mass_spring.h |