Cleanup: cmake indentation

2023-11-04 16:41:18 +11:00 · 2023-11-04 16:41:18 +11:00 · 2b508f7ae3
parent 243516e1d3
commit 2b508f7ae3
5 changed files with 187 additions and 143 deletions
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@ -70,7 +70,7 @@ set(FFMPEG_EXTRA_FLAGS

 set(FFMPEG_ENV)
 if(NOT WIN32)
-set(FFMPEG_ENV "PKG_CONFIG_PATH=\
+  set(FFMPEG_ENV "PKG_CONFIG_PATH=\
 ${temp_LIBDIR}/openjpeg/lib/pkgconfig:\
 ${temp_LIBDIR}/x264/lib/pkgconfig:\
 ${temp_LIBDIR}/vorbis/lib/pkgconfig:\
@ -80,7 +80,7 @@ ${temp_LIBDIR}/theora/lib/pkgconfig:\
 ${temp_LIBDIR}/openjpeg/lib/pkgconfig:\
 ${temp_LIBDIR}/opus/lib/pkgconfig:\
 ${temp_LIBDIR}/aom/lib/pkgconfig:"
-)
+  )
 endif()

 unset(temp_LIBDIR)
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@ -18,44 +18,56 @@ set(MY_WC_COMMIT_TIMESTAMP 0)

 # Guess if this is a git working copy and then look up the revision
 if(EXISTS ${SOURCE_DIR}/.git)
-  execute_process(COMMAND git rev-parse --abbrev-ref HEAD
-                  WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE MY_WC_BRANCH
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(
+    COMMAND git rev-parse --abbrev-ref HEAD
+    WORKING_DIRECTORY ${SOURCE_DIR}
+    OUTPUT_VARIABLE MY_WC_BRANCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )

  if(MY_WC_BRANCH STREQUAL "HEAD")
    # Detached HEAD, check whether commit hash is reachable
    # in the main branch
-    execute_process(COMMAND git rev-parse --short=12 HEAD
-                    WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE MY_WC_HASH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(
+      COMMAND git rev-parse --short=12 HEAD
+      WORKING_DIRECTORY ${SOURCE_DIR}
+      OUTPUT_VARIABLE MY_WC_HASH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )

-    execute_process(COMMAND git branch --list main blender-v* --contains ${MY_WC_HASH}
-                    WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_contains_check
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(
+      COMMAND git branch --list main blender-v* --contains ${MY_WC_HASH}
+      WORKING_DIRECTORY ${SOURCE_DIR}
+      OUTPUT_VARIABLE _git_contains_check
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )

    if(NOT _git_contains_check STREQUAL "")
      set(MY_WC_BRANCH "main")
    else()
-      execute_process(COMMAND git show-ref --tags -d
-                      WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE _git_tag_hashes
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process(
+        COMMAND git show-ref --tags -d
+        WORKING_DIRECTORY ${SOURCE_DIR}
+        OUTPUT_VARIABLE _git_tag_hashes
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )

-      execute_process(COMMAND git rev-parse HEAD
-                      WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE _git_head_hash
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process(
+        COMMAND git rev-parse HEAD
+        WORKING_DIRECTORY ${SOURCE_DIR}
+        OUTPUT_VARIABLE _git_head_hash
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )

      if(_git_tag_hashes MATCHES "${_git_head_hash}")
        set(MY_WC_BRANCH "main")
      else()
-        execute_process(COMMAND git branch --contains ${MY_WC_HASH}
-                        WORKING_DIRECTORY ${SOURCE_DIR}
-                        OUTPUT_VARIABLE _git_contains_branches
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(
+          COMMAND git branch --contains ${MY_WC_HASH}
+          WORKING_DIRECTORY ${SOURCE_DIR}
+          OUTPUT_VARIABLE _git_contains_branches
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
        string(REGEX REPLACE "^\\*[ \t]+" "" _git_contains_branches "${_git_contains_branches}")
        string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}")
        string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}")
@ -76,66 +88,82 @@ if(EXISTS ${SOURCE_DIR}/.git)

    unset(_git_contains_check)
  else()
-    execute_process(COMMAND git log HEAD..@{u}
-                    WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_below_check
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
+    execute_process(
+      COMMAND git log HEAD..@{u}
+      WORKING_DIRECTORY ${SOURCE_DIR}
+      OUTPUT_VARIABLE _git_below_check
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
    if(NOT _git_below_check STREQUAL "")
-      # If there're commits between HEAD and upstream this means
+      # If there are commits between HEAD and upstream this means
      # that we're reset-ed to older revision. Use its hash then.
-      execute_process(COMMAND git rev-parse --short=12 HEAD
-                      WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE MY_WC_HASH
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process(
+        COMMAND git rev-parse --short=12 HEAD
+        WORKING_DIRECTORY ${SOURCE_DIR}
+        OUTPUT_VARIABLE MY_WC_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
    else()
-      execute_process(COMMAND git rev-parse --short=12 @{u}
-                      WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE MY_WC_HASH
-                      OUTPUT_STRIP_TRAILING_WHITESPACE
-                      ERROR_QUIET)
+      execute_process(
+        COMMAND git rev-parse --short=12 @{u}
+        WORKING_DIRECTORY ${SOURCE_DIR}
+        OUTPUT_VARIABLE MY_WC_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+      )

      if(MY_WC_HASH STREQUAL "")
        # Local branch, not set to upstream.
        # Well, let's use HEAD for now
-        execute_process(COMMAND git rev-parse --short=12 HEAD
-                        WORKING_DIRECTORY ${SOURCE_DIR}
-                        OUTPUT_VARIABLE MY_WC_HASH
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(
+          COMMAND git rev-parse --short=12 HEAD
+          WORKING_DIRECTORY ${SOURCE_DIR}
+          OUTPUT_VARIABLE MY_WC_HASH
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
      endif()
    endif()

    unset(_git_below_check)
  endif()

-  execute_process(COMMAND git log -1 --format=%ct
-                  WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(
+    COMMAND git log -1 --format=%ct
+    WORKING_DIRECTORY ${SOURCE_DIR}
+    OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
  # May fail in rare cases
  if(MY_WC_COMMIT_TIMESTAMP STREQUAL "")
    set(MY_WC_COMMIT_TIMESTAMP 0)
  endif()

  # Update GIT index before getting dirty files
-  execute_process(COMMAND git update-index -q --refresh
-                  WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(
+    COMMAND git update-index -q --refresh
+    WORKING_DIRECTORY ${SOURCE_DIR}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )

-  execute_process(COMMAND git diff-index --name-only HEAD --
-                  WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE _git_changed_files
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(
+    COMMAND git diff-index --name-only HEAD --
+    WORKING_DIRECTORY ${SOURCE_DIR}
+    OUTPUT_VARIABLE _git_changed_files
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )

  if(NOT _git_changed_files STREQUAL "")
    string(APPEND MY_WC_BRANCH " (modified)")
  else()
-    # Unpushed commits are also considered local modifications
-    execute_process(COMMAND git log @{u}..
-                    WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_unpushed_log
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
+    # Un-pushed commits are also considered local modifications.
+    execute_process(
+      COMMAND git log @{u}..
+      WORKING_DIRECTORY ${SOURCE_DIR}
+      OUTPUT_VARIABLE _git_unpushed_log
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
    if(NOT _git_unpushed_log STREQUAL "")
      string(APPEND MY_WC_BRANCH " (modified)")
    endif()
@ -171,9 +199,11 @@ unset(MY_WC_BRANCH)
 unset(BUILD_DATE)
 unset(BUILD_TIME)

-
 # Copy the file to the final header only if the version changes
 # and avoid needless rebuilds
 # TODO: verify this comment is true, as BUILD_TIME probably changes
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        buildinfo.h.txt buildinfo.h)
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+  -E copy_if_different
+  buildinfo.h.txt buildinfo.h
+)
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@ -30,11 +30,13 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
  find_package(Git)
  if(GIT_FOUND)
    # message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-    execute_process(COMMAND git rev-parse --short=12 HEAD
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                    OUTPUT_VARIABLE MY_WC_HASH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
+    execute_process(
+      COMMAND git rev-parse --short=12 HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE MY_WC_HASH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      ERROR_QUIET
+    )
  endif()
 endif()
 set(BUILD_REV ${MY_WC_HASH})
@ -124,7 +126,8 @@ macro(add_package_archive packagename extension)
  add_custom_command(
    OUTPUT ${package_output}
    COMMAND ${build_archive} ${packagename} ${extension} bin release
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
  unset(build_archive)
  unset(package_output)
 endmacro()
@ -132,14 +135,16 @@ endmacro()
 if(APPLE)
  add_package_archive(
    "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
-    "zip")
+    "zip"
+  )
 elseif(UNIX)
  # platform name could be tweaked, to include glibc, and ensure processor is correct (i386 vs i686)
  string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)

  add_package_archive(
    "${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
-    "tar.xz")
+    "tar.xz"
+  )
 endif()

 unset(MAJOR_VERSION)
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@ -895,17 +895,22 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
  foreach(device ${CYCLES_ONEAPI_INTEL_BINARIES_ARCH})
    # Run ocloc ids to test if the device is supported.
    if(WIN32)
-      execute_process(COMMAND ${OCLOC_INSTALL_DIR}/ocloc.exe ids ${device}
-                      RESULT_VARIABLE oclocids_ret
-                      OUTPUT_QUIET
-                      ERROR_QUIET)
+      execute_process(
+        COMMAND ${OCLOC_INSTALL_DIR}/ocloc.exe ids ${device}
+        RESULT_VARIABLE oclocids_ret
+        OUTPUT_QUIET
+        ERROR_QUIET
+      )
    else()
-      execute_process(COMMAND ${CMAKE_COMMAND}
-                              -E env "LD_LIBRARY_PATH=${OCLOC_INSTALL_DIR}/lib:${IGC_INSTALL_DIR}/lib"
-                              ${OCLOC_INSTALL_DIR}/bin/ocloc ids ${device}
-                      RESULT_VARIABLE oclocids_ret
-                      OUTPUT_QUIET
-                      ERROR_QUIET)
+      execute_process(
+        COMMAND ${CMAKE_COMMAND}
+        -E env "LD_LIBRARY_PATH=${OCLOC_INSTALL_DIR}/lib:${IGC_INSTALL_DIR}/lib"
+        ${OCLOC_INSTALL_DIR}/bin/ocloc ids ${device}
+
+        RESULT_VARIABLE oclocids_ret
+        OUTPUT_QUIET
+        ERROR_QUIET
+      )
    endif()
    if(NOT oclocids_ret EQUAL 0)
      list(REMOVE_ITEM CYCLES_ONEAPI_INTEL_BINARIES_ARCH ${device})
@ -924,7 +929,9 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
    list(APPEND sycl_compiler_flags -fsycl-targets=${targets_string})
    foreach(target ${CYCLES_ONEAPI_SYCL_TARGETS})
      if(DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_${target})
-        list(APPEND sycl_compiler_flags "-Xsycl-target-backend=${target} \"${CYCLES_ONEAPI_SYCL_OPTIONS_${target}}\"")
+        list(APPEND sycl_compiler_flags
+          "-Xsycl-target-backend=${target} \"${CYCLES_ONEAPI_SYCL_OPTIONS_${target}}\""
+        )
      endif()
    endforeach()
  else()
@ -985,12 +992,12 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
        set(next_library_mode "")
      endif()
    endforeach()
-      list(APPEND sycl_compiler_flags
-        "$<$<CONFIG:Release>:${EMBREE_TBB_LIBRARIES_optimized}>"
-        "$<$<CONFIG:RelWithDebInfo>:${EMBREE_TBB_LIBRARIES_optimized}>"
-        "$<$<CONFIG:MinSizeRel>:${EMBREE_TBB_LIBRARIES_optimized}>"
-        "$<$<CONFIG:Debug>:${EMBREE_TBB_LIBRARIES_debug}>"
-      )
+    list(APPEND sycl_compiler_flags
+      "$<$<CONFIG:Release>:${EMBREE_TBB_LIBRARIES_optimized}>"
+      "$<$<CONFIG:RelWithDebInfo>:${EMBREE_TBB_LIBRARIES_optimized}>"
+      "$<$<CONFIG:MinSizeRel>:${EMBREE_TBB_LIBRARIES_optimized}>"
+      "$<$<CONFIG:Debug>:${EMBREE_TBB_LIBRARIES_debug}>"
+    )
  endif()

  if(WITH_CYCLES_DEBUG)
@ -1001,16 +1008,17 @@ if(WITH_CYCLES_DEVICE_ONEAPI)

  if(WIN32) # Add Windows specific compiler flags.
    list(APPEND sycl_compiler_flags
-    -fuse-ld=link
-    -fms-extensions
-    -fms-compatibility
-    -D_WINDLL
-    -D_MBCS
-    -DWIN32
-    -D_WINDOWS
-    -D_CRT_NONSTDC_NO_DEPRECATE
-    -D_CRT_SECURE_NO_DEPRECATE
-    -DONEAPI_EXPORT)
+      -fuse-ld=link
+      -fms-extensions
+      -fms-compatibility
+      -D_WINDLL
+      -D_MBCS
+      -DWIN32
+      -D_WINDOWS
+      -D_CRT_NONSTDC_NO_DEPRECATE
+      -D_CRT_SECURE_NO_DEPRECATE
+      -DONEAPI_EXPORT
+    )

    string(REPLACE /Redist/ /Tools/ MSVC_TOOLS_DIR ${MSVC_REDIST_DIR})
    # Version Folder between Redist and Tools can mismatch sometimes
@ -1026,9 +1034,10 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
      get_filename_component(WINDOWS_KIT_DIR "${WINDOWS_KIT_DIR}/../" ABSOLUTE)
    endif()
    list(APPEND sycl_compiler_flags
-                -L"${MSVC_TOOLS_DIR}/lib/x64"
-                -L"${WINDOWS_KIT_DIR}/um/x64"
-                -L"${WINDOWS_KIT_DIR}/ucrt/x64")
+      -L"${MSVC_TOOLS_DIR}/lib/x64"
+      -L"${WINDOWS_KIT_DIR}/um/x64"
+      -L"${WINDOWS_KIT_DIR}/ucrt/x64"
+    )
  else() # Add Linux specific compiler flags.
    list(APPEND sycl_compiler_flags -fPIC)
    list(APPEND sycl_compiler_flags -fvisibility=hidden)
@ -1048,22 +1057,22 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
  set(sycl_compiler_flags_RelWithDebInfo ${sycl_compiler_flags})

  list(APPEND sycl_compiler_flags_Release
-              -DNDEBUG
-              )
+    -DNDEBUG
+  )
  list(APPEND sycl_compiler_flags_RelWithDebInfo
-              -DNDEBUG
-              -g
-              )
+    -DNDEBUG
+    -g
+  )
  list(APPEND sycl_compiler_flags_Debug
-              -g
-              )
+    -g
+  )

  if(WIN32)
    list(APPEND sycl_compiler_flags_Debug
-                -D_DEBUG
-                -nostdlib
-                -Xclang --dependent-lib=msvcrtd
-                )
+      -D_DEBUG
+      -nostdlib
+      -Xclang --dependent-lib=msvcrtd
+    )
    add_custom_command(
      OUTPUT ${cycles_kernel_oneapi_lib} ${cycles_kernel_oneapi_linker_lib}
      COMMAND ${CMAKE_COMMAND} -E env
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@ -770,33 +770,33 @@ endif()
 # NOTE: WITH_COMPOSITOR_CPU is needed for rendering.
 if(WITH_COMPOSITOR_REALTIME_TESTS AND WITH_COMPOSITOR_CPU)
  if(NOT OPENIMAGEIO_IDIFF)
-      message(WARNING "Disabling realtime compositor tests because OIIO idiff does not exist")
-    else()
-      set(compositor_tests
-          color
-          converter
-          filter
-          input
-          output
-          vector
+    message(WARNING "Disabling realtime compositor tests because OIIO idiff does not exist")
+  else()
+    set(compositor_tests
+        color
+        converter
+        filter
+        input
+        output
+        vector

-          multiple_node_setups
-        )
+        multiple_node_setups
+      )

-      if(WITH_LIBMV)
-        list(APPEND compositor_tests distort matte)
-      endif()
+    if(WITH_LIBMV)
+      list(APPEND compositor_tests distort matte)
+    endif()

-      foreach(comp_test ${compositor_tests})
-        add_python_test(
-          compositor_${comp_test}_realtime_test
-          ${CMAKE_CURRENT_LIST_DIR}/compositor_realtime_render_tests.py
-          -blender "${TEST_BLENDER_EXE}"
-          -testdir "${TEST_SRC_DIR}/compositor/${comp_test}"
-          -idiff "${OPENIMAGEIO_IDIFF}"
-          -outdir "${TEST_OUT_DIR}/compositor_realtime"
-        )
-      endforeach()
+    foreach(comp_test ${compositor_tests})
+      add_python_test(
+        compositor_${comp_test}_realtime_test
+        ${CMAKE_CURRENT_LIST_DIR}/compositor_realtime_render_tests.py
+        -blender "${TEST_BLENDER_EXE}"
+        -testdir "${TEST_SRC_DIR}/compositor/${comp_test}"
+        -idiff "${OPENIMAGEIO_IDIFF}"
+        -outdir "${TEST_OUT_DIR}/compositor_realtime"
+      )
+    endforeach()
  endif()
 endif()

@ -855,7 +855,7 @@ if(EXISTS "${TEST_SRC_DIR}/modeling/geometry_nodes/simulation/")
      geo_node_simulation_test_${filename}
      ${file}
      --python ${TEST_PYTHON_DIR}/geo_node_sim_test.py
-      )
+    )
  endforeach()
 else()
  message(STATUS "Directory named ${TEST_SRC_DIR}/modeling/geometry_nodes/simulation/ not found, disabling tests")
@ -917,10 +917,10 @@ endif()

 if(WITH_USD)
  add_blender_test(
-          bf_io_usd_export_test
-          --python ${CMAKE_CURRENT_LIST_DIR}/bl_usd_export_test.py
-          --
-          --testdir "${TEST_SRC_DIR}/usd"
+    bf_io_usd_export_test
+    --python ${CMAKE_CURRENT_LIST_DIR}/bl_usd_export_test.py
+    --
+    --testdir "${TEST_SRC_DIR}/usd"
  )
  add_blender_test(
    bf_io_usd_import_test