From 5794913fb81ef08d0a49e21c51466b6b27ea6706 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Jul 2024 09:58:45 +1000 Subject: [PATCH] Cleanup: CMake file indentation, wrap long lines --- intern/cycles/kernel/osl/shaders/CMakeLists.txt | 8 +++++++- source/blender/gpu/CMakeLists.txt | 4 +++- source/blender/makesdna/intern/CMakeLists.txt | 3 ++- source/blender/makesrna/intern/CMakeLists.txt | 13 +++++++++---- source/creator/CMakeLists.txt | 5 +++-- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/intern/cycles/kernel/osl/shaders/CMakeLists.txt b/intern/cycles/kernel/osl/shaders/CMakeLists.txt index 223e0922b46..443fce26b20 100644 --- a/intern/cycles/kernel/osl/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/osl/shaders/CMakeLists.txt @@ -138,7 +138,13 @@ foreach(_file ${SRC_OSL}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( OUTPUT ${_OSO_FILE} - COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} + COMMAND + ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} + ${OSL_COMPILER} -q -O2 + -I"${CMAKE_CURRENT_SOURCE_DIR}" + -I"${OSL_SHADER_DIR}" + -o ${_OSO_FILE} + ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER} ) list(APPEND SRC_OSO diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 2aae9630253..38ae8b725d3 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -899,7 +899,9 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER) add_custom_command( OUTPUT ${SRC_BAKED_CREATE_INFOS_FILE} - COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} $ ${SRC_BAKED_CREATE_INFOS_FILE} + COMMAND + ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} + $ ${SRC_BAKED_CREATE_INFOS_FILE} DEPENDS shader_builder ) set(GPU_SHADER_INFO_SRC diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index b2befa2a78a..a2101f7cc83 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -104,7 +104,8 @@ add_custom_command( ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.c - COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} + COMMAND + ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} "$" ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 539fcd6cc7d..f475b114c4b 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -21,7 +21,7 @@ if(CMAKE_GENERATOR MATCHES ".*Unix Makefiles") add_definitions(-DUSE_MAKEFILE_WORKAROUND) endif() -# files rna_access.cc rna_define.cc makesrna.cc intentionally excluded. +# Files `rna_access.cc`, `rna_define.cc`, `makesrna.cc` intentionally excluded. set(DEFSRC rna_ID.cc rna_action.cc @@ -141,7 +141,11 @@ set(APISRC rna_workspace_api.cc ) -string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).cc" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.cc" GENSRC "${DEFSRC}") +string( + REGEX REPLACE + "rna_([a-zA-Z0-9_-]*).cc" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.cc" + GENSRC "${DEFSRC}" +) list(APPEND GENSRC "${CMAKE_CURRENT_BINARY_DIR}/rna_prototypes_gen.hh" "${CMAKE_CURRENT_BINARY_DIR}/../RNA_prototypes.hh" @@ -464,8 +468,9 @@ endif() # `valgrind --leak-check=full --track-origins=yes` add_custom_command( OUTPUT ${GENSRC} - COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} - "$" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../ + COMMAND + ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} + "$" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../ DEPENDS makesrna ) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4329cb35fc0..30f4eb4ecb2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -632,8 +632,9 @@ if(NOT ("${_install_cmd}" STREQUAL "")) get_filename_component(_install_dst ${TARGETDIR_VER} ABSOLUTE BASE_DIR ${CMAKE_INSTALL_PREFIX}) add_custom_command( TARGET blender POST_BUILD MAIN_DEPENDENCY blender - COMMAND ${CMAKE_COMMAND} -E echo - "Run: \\\"${_install_cmd}\\\" to copy runtime files and scripts to: ${_install_dst}" + COMMAND + ${CMAKE_COMMAND} -E echo + "Run: \\\"${_install_cmd}\\\" to copy runtime files and scripts to: ${_install_dst}" ) unset(_install_dst) endif()