[Bf-blender-cvs] [4d8301dcb2e] tmp_libupdate_34: Cleanup: formatting and simplification

[Brecht Van Lommel]

Commit: 4d8301dcb2eddac683c69a7bd527d3012c233cb9
Author: Brecht Van Lommel
Date:   Tue Aug 16 01:08:22 2022 +0200
Branches: tmp_libupdate_34
https://developer.blender.org/rB4d8301dcb2eddac683c69a7bd527d3012c233cb9

Cleanup: formatting and simplification

===================================================================

M	build_files/build_environment/cmake/harfbuzz.cmake
M	build_files/build_environment/cmake/openvdb.cmake
M	build_files/build_environment/cmake/options.cmake
M	build_files/build_environment/cmake/tbb.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/harfbuzz.cmake b/build_files/build_environment/cmake/harfbuzz.cmake
index 309dff867ea..0ae9b11d627 100644
--- a/build_files/build_environment/cmake/harfbuzz.cmake
+++ b/build_files/build_environment/cmake/harfbuzz.cmake
@@ -13,8 +13,6 @@ set(HARFBUZZ_EXTRA_OPTIONS
   -Dgobject=disabled
 )
 
-
-
 ExternalProject_Add(external_harfbuzz
   URL file://${PACKAGE_DIR}/${HARFBUZZ_FILE}
   URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH}
@@ -31,6 +29,7 @@ add_dependencies(
   external_python
   external_python_site_packages
 )
+
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_harfbuzz after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/harfbuzz/include ${HARVEST_TARGET}/harfbuzz/include
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake
index f9db82748c9..9939b5943c0 100644
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -4,8 +4,6 @@ if(BUILD_MODE STREQUAL Debug)
   set(BLOSC_POST _d)
 endif()
 
-set(OPENVDB_SHARED ON)
-set(OPENVDB_STATIC OFF)
 set(OPENVDB_EXTRA_ARGS
   ${DEFAULT_BOOST_FLAGS}
   -DUSE_STATIC_DEPENDENCIES=OFF   # This is the global toggle for static libs
@@ -27,8 +25,8 @@ set(OPENVDB_EXTRA_ARGS
   -DTBB_ROOT=${LIBDIR}/tbb/
   -DTbb_INCLUDE_DIR=${LIBDIR}/tbb/include
   -DTbb_LEGACY_INCLUDE_DIR=${LIBDIR}/tbb/include
-  -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
-  -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
+  -DOPENVDB_CORE_SHARED=ON
+  -DOPENVDB_CORE_STATIC=OFF
   -DOPENVDB_BUILD_BINARIES=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
   -DBLOSC_USE_STATIC_LIBS=ON
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index a69cfe922ee..02e1f23f40a 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -81,7 +81,7 @@ if(WIN32)
 
   # some build systems like meson will respect the *nix like environment vars
   # like CFLAGS and LDFlags but will still build with the MSVC compiler, so for
-  # those we need to empty out the gcc style flags that are normally in there. 
+  # those we need to empty out the gcc style flags that are normally in there.
   set(CONFIGURE_ENV_MSVC
     cd ${MINGW_PATH} &&
     call ${PERL_SHELL} &&
diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake
index 170bb61be54..17b1f0fd869 100644
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -1,14 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-  set(TBB_EXTRA_ARGS
-    -DTBB_BUILD_SHARED=On
-    -DTBB_BUILD_TBBMALLOC=On
-    -DTBB_BUILD_TBBMALLOC_PROXY=On
-    -DTBB_BUILD_STATIC=Off
-    -DTBB_BUILD_TESTS=Off
-    -DCMAKE_DEBUG_POSTFIX=_debug
-  )
-  set(TBB_LIBRARY tbb)
-  set(TBB_STATIC_LIBRARY Off)
+set(TBB_EXTRA_ARGS
+  -DTBB_BUILD_SHARED=On
+  -DTBB_BUILD_TBBMALLOC=On
+  -DTBB_BUILD_TBBMALLOC_PROXY=On
+  -DTBB_BUILD_STATIC=Off
+  -DTBB_BUILD_TESTS=Off
+  -DCMAKE_DEBUG_POSTFIX=_debug
+)
+set(TBB_LIBRARY tbb)
+set(TBB_STATIC_LIBRARY Off)
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb