From 5dd160c39cbf5db3282a1ab1bbd35b9c5ee85575 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Jul 2025 00:40:42 +0000 Subject: [PATCH] Cleanup: indentation in cmake, sort files --- build_files/build_environment/cmake/openjpeg.cmake | 4 ++-- .../build_environment/cmake/package_python.cmake | 2 +- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/makesdna/intern/CMakeLists.txt | 2 +- source/blender/nodes/CMakeLists.txt | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake index 7e391e87902..f1e91786e27 100644 --- a/build_files/build_environment/cmake/openjpeg.cmake +++ b/build_files/build_environment/cmake/openjpeg.cmake @@ -64,10 +64,10 @@ else() if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_openjpeg_msvc after_install COMMAND - ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib && - ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include diff --git a/build_files/build_environment/cmake/package_python.cmake b/build_files/build_environment/cmake/package_python.cmake index 9ee32608f1a..c9efd823f42 100644 --- a/build_files/build_environment/cmake/package_python.cmake +++ b/build_files/build_environment/cmake/package_python.cmake @@ -102,7 +102,7 @@ if(MSVC) external_zstandard external_cython OUTPUT - ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe + ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe ) endif() endif() diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 172abd5214f..75de8a0e7c6 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -492,9 +492,9 @@ set(SRC BKE_outliner_treehash.hh BKE_packedFile.hh BKE_paint.hh - BKE_paint_types.hh BKE_paint_bvh.hh BKE_paint_bvh_pixels.hh + BKE_paint_types.hh BKE_particle.h BKE_path_templates.hh BKE_pointcache.h diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index d650f76cfae..cf5e4b26ccf 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -104,7 +104,7 @@ add_custom_command( ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.cc ${CMAKE_CURRENT_BINARY_DIR}/dna_struct_ids.cc - COMMAND + COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} "$" ${CMAKE_CURRENT_BINARY_DIR}/dna.cc diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 1763d1ce806..12358beeeca 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -25,12 +25,12 @@ function(add_node_discovery ${output_file} COMMAND ${PYTHON_EXECUTABLE} - ${DISCOVER_NODES_PATH} - ${CMAKE_CURRENT_SOURCE_DIR} - ${output_file} - ${output_function} - ${sources} - ${extra_args} + ${DISCOVER_NODES_PATH} + ${CMAKE_CURRENT_SOURCE_DIR} + ${output_file} + ${output_function} + ${sources} + ${extra_args} DEPENDS ${SRC} ${DISCOVER_NODES_PATH}