Cleanup: cmake indentation, white-space

2021-02-05 09:45:16 +11:00 · 2021-02-05 09:45:16 +11:00 · 7e850ffa73
parent 94cf74afbb
commit 7e850ffa73
16 changed files with 27 additions and 28 deletions
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@ -32,8 +32,8 @@ set(OPENCOLORIO_EXTRA_ARGS

 if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
  set(OPENCOLORIO_EXTRA_ARGS
-     ${OPENCOLORIO_EXTRA_ARGS}
-     -DOCIO_USE_SSE=OFF
+    ${OPENCOLORIO_EXTRA_ARGS}
+    -DOCIO_USE_SSE=OFF
  )
 endif()

--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@ -79,7 +79,7 @@ else()
    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
- endif()
+  endif()

  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@ -20,7 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)

 if(APPLE)
-   set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
+  set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
 else()
  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@ -265,7 +265,7 @@ set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.
 set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)

 set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-2.5.5.zip)
 set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)

 # Libraries to keep Python modules static on Linux.
@ -309,7 +309,7 @@ set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.
 set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)

 set(MESA_VERSION 18.3.1)
-set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
+set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
 set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)

 set(NASM_VERSION 2.15.02)
--- a/build_files/cmake/Modules/FindAudaspace.cmake
+++ b/build_files/cmake/Modules/FindAudaspace.cmake
@ -19,7 +19,7 @@
 #=============================================================================

 IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
- SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
+  SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
 ENDIF()

 SET(_audaspace_SEARCH_DIRS
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@ -59,14 +59,14 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
    PATH_SUFFIXES
      lib64 lib
    )
-  IF (NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
-    IF (EMBREE_EMBREE3_LIBRARY)
+  IF(NOT EMBREE_${UPPERCOMPONENT}_LIBRARY)
+    IF(EMBREE_EMBREE3_LIBRARY)
      # If we can't find all the static libraries, try to fall back to the shared library if found.
      # This allows building with a shared embree library
      SET(_embree_LIBRARIES ${EMBREE_EMBREE3_LIBRARY})
      BREAK()
-    ENDIF ()
-  ENDIF ()
+    ENDIF()
+  ENDIF()
  LIST(APPEND _embree_LIBRARIES "${EMBREE_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()

--- a/build_files/cmake/Modules/GTest.cmake
+++ b/build_files/cmake/Modules/GTest.cmake
@ -272,7 +272,7 @@ cmake_policy(SET CMP0057 NEW) # if IN_LIST
 #------------------------------------------------------------------------------
 function(gtest_add_tests)

-  if (ARGC LESS 1)
+  if(ARGC LESS 1)
    message(FATAL_ERROR "No arguments supplied to gtest_add_tests()")
  endif()

@ -298,7 +298,7 @@ function(gtest_add_tests)
    set(autoAddSources YES)
  else()
    # Non-keyword syntax, convert to keyword form
-    if (ARGC LESS 3)
+    if(ARGC LESS 3)
      message(FATAL_ERROR "gtest_add_tests() without keyword options requires at least 3 arguments")
    endif()
    set(ARGS_TARGET     "${ARGV0}")
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@ -389,7 +389,7 @@ function(blender_add_lib
 endfunction()

 function(blender_add_test_suite)
-  if (ARGC LESS 1)
+  if(ARGC LESS 1)
    message(FATAL_ERROR "No arguments supplied to blender_add_test_suite()")
  endif()

@ -1209,9 +1209,9 @@ function(find_python_package
        site-packages
        dist-packages
        vendor-packages
-       NO_DEFAULT_PATH
-       DOC
-         "Path to python site-packages or dist-packages containing '${package}' module"
+      NO_DEFAULT_PATH
+      DOC
+        "Path to python site-packages or dist-packages containing '${package}' module"
    )
    mark_as_advanced(PYTHON_${_upper_package}_PATH)

--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@ -353,7 +353,7 @@ endif()
 if(WITH_PUGIXML)
  find_package_wrapper(PugiXML)

-  if (NOT PUGIXML_FOUND)
+  if(NOT PUGIXML_FOUND)
    set(WITH_PUGIXML OFF)
    message(STATUS "PugiXML not found, disabling WITH_PUGIXML")
  endif()
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@ -102,7 +102,7 @@ set(SRC
 )

 set(LIB
- ${BOOST_LIBRARIES}
+  ${BOOST_LIBRARIES}
 )

 blender_add_lib(extern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@ -383,7 +383,7 @@ if(WITH_CYCLES_OPENSUBDIV)
        optimized ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU.lib
        debug ${OPENSUBDIV_ROOT_DIR}/lib/osdCPU_d.lib
        debug ${OPENSUBDIV_ROOT_DIR}/lib/osdGPU_d.lib
-     )
+      )
    endif()
  endif()
 endif()
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5)

 project(GhostMultiTest)

-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../..//build_files/cmake/Modules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../../build_files/cmake/Modules")

 set(WITH_GUARDEDALLOC ON)

--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@ -683,7 +683,7 @@ endif()

 if(WITH_OPENVDB)
  list(APPEND INC
-     ../../../intern/openvdb
+    ../../../intern/openvdb
  )
  list(APPEND INC_SYS
    ${OPENVDB_INCLUDE_DIRS}
@ -697,10 +697,10 @@ endif()

 if(WITH_QUADRIFLOW)
  list(APPEND INC
-     ../../../intern/quadriflow
+    ../../../intern/quadriflow
  )
  list(APPEND LIB
-     bf_intern_quadriflow
+    bf_intern_quadriflow
  )
  add_definitions(-DWITH_QUADRIFLOW)
 endif()
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@ -185,7 +185,7 @@ endif()

 if(WITH_OPENVDB)
  list(APPEND INC
-     ../../../intern/openvdb
+    ../../../intern/openvdb
  )
  list(APPEND INC_SYS
    ${OPENVDB_INCLUDE_DIRS}
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@ -764,7 +764,7 @@ elseif(WIN32)
        PATTERN "*.pyo" EXCLUDE                 # * any cache *
      )

-       install(
+      install(
        DIRECTORY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib
        DESTINATION ${BLENDER_VERSION}/python/
        CONFIGURATIONS Debug
@ -772,7 +772,6 @@ elseif(WIN32)
        PATTERN "__pycache__" EXCLUDE           # * any cache *
        PATTERN "*.pyc" EXCLUDE                 # * any cache *
        PATTERN "*.pyo" EXCLUDE                 # * any cache *)
-
      )

      install(
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@ -72,7 +72,7 @@ elseif(APPLE)
  set(_test_libs_dependencies)
  foreach(_lib ${_test_libs})
    get_target_property(_interface_libs ${_lib} INTERFACE_LINK_LIBRARIES)
-    if (_interface_libs)
+    if(_interface_libs)
      list(APPEND _test_libs_dependencies ${_interface_libs})
    endif()
    unset(_interface_libs)