diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index ae16c37b447..29b7afd7d1f 100644 --- a/build_files/build_environment/cmake/download.cmake +++ b/build_files/build_environment/cmake/download.cmake @@ -17,7 +17,7 @@ function(download_source dep) set(TARGET_URI https://projects.blender.org/blender/lib-source/media/branch/main/${TARGET_FILE}) endif() # Validate all required variables are set and give an explicit error message - # rather than CMake erroring out later on with a more ambigious error. + # rather than CMake erroring out later on with a more ambiguous error. if(NOT DEFINED TARGET_FILE) message(FATAL_ERROR "${dep}_FILE variable not set") endif() diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake index f0d0bee2956..c8328ba971d 100644 --- a/build_files/build_environment/cmake/dpcpp.cmake +++ b/build_files/build_environment/cmake/dpcpp.cmake @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with +# LLVM does not switch over to cpp17 until llvm 16 and building earlier versions with # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms # for now. string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake index 0eb6ef5e331..c880ed5b4f7 100644 --- a/build_files/build_environment/cmake/llvm.cmake +++ b/build_files/build_environment/cmake/llvm.cmake @@ -53,7 +53,7 @@ else() set(LLVM_GENERATOR "Unix Makefiles") endif() -# LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with +# LLVM does not switch over to cpp17 until llvm 16 and building earlier versions with # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms # for now. string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 0dcebf720e3..737a98c80ae 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -109,7 +109,7 @@ if(WIN32) # We don't want the SOABI tags in the final filename since it gets the debug # tags wrong and the final .pyd won't be found by python, pybind11 will try to # get the tags and dump them into PYTHON_MODULE_EXTENSION every time the current - # python interperter doesn't match the old one, overwriting our preference. + # python interpreter doesn't match the old one, overwriting our preference. # To side step this behavior we set PYBIND11_PYTHON_EXECUTABLE_LAST so it'll # leave the PYTHON_MODULE_EXTENSION value we set alone. list(APPEND OPENIMAGEIO_EXTRA_ARGS -DPYBIND11_PYTHON_EXECUTABLE_LAST=${PYTHON_BINARY}) diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 1db7ced4f37..d0bdfadd547 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -6,13 +6,13 @@ if(WIN32) option(ENABLE_MSYS2 "Enable building of ffmpeg/libsndfile/fftw3/gmp by installing msys2" ON) option(MSYS2_USE_UPSTREAM_PACKAGES "Use upstream packages to bootstrap msys2, when OFF the blender mirror will be used" OFF) endif() -option(FORCE_CHECK_HASH "Force a check of all hashses during CMake the configure phase" OFF) +option(FORCE_CHECK_HASH "Force a check of all hashes during CMake the configure phase" OFF) cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES) set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with") # Any python module building with setup.py cannot use multiple theads on windows -# as they will try to write to the same .pdb file simultaniously which causes +# as they will try to write to the same .pdb file simultaneously which causes # build errors. if(WIN32) set(PYTHON_MAKE_THREADS 1) diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake index 16f13467467..6cfb0e8cda3 100644 --- a/build_files/build_environment/cmake/python.cmake +++ b/build_files/build_environment/cmake/python.cmake @@ -160,7 +160,7 @@ else() if(NOT APPLE) set(PYTHON_CONFIGURE_EXTRA_ARGS ${PYTHON_CONFIGURE_EXTRA_ARGS} - # We disable optimzations as this flag turns on PGO which leads to non-reproducible builds. + # We disable optimizations as this flag turns on PGO which leads to non-reproducible builds. --disable-optimizations # While LTO is OK when building on the same system, it's incompatible across GCC versions, # making it impractical for developers to build against, so keep it disabled. diff --git a/build_files/build_environment/cmake/zstd.cmake b/build_files/build_environment/cmake/zstd.cmake index 96890ed91d0..aaec8d26da1 100644 --- a/build_files/build_environment/cmake/zstd.cmake +++ b/build_files/build_environment/cmake/zstd.cmake @@ -40,7 +40,7 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/ - # The zstandard python extention hardcoded links to ztsd.lib + # The zstandard python extension hardcoded links to ztsd.lib COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${LIBDIR}/zstd/lib/zstd${LIBEXT} @@ -48,7 +48,7 @@ if(WIN32) ) else() ExternalProject_Add_Step(external_zstd after_install - # The zstandard python extention hardcoded links to ztsd.lib + # The zstandard python extension hardcoded links to ztsd.lib COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${LIBDIR}/zstd/lib/zstd${LIBEXT} diff --git a/build_files/build_environment/windows/vmbuild.cmd.txt b/build_files/build_environment/windows/vmbuild.cmd.txt index b66cb3853b2..4b0635e2ba4 100644 --- a/build_files/build_environment/windows/vmbuild.cmd.txt +++ b/build_files/build_environment/windows/vmbuild.cmd.txt @@ -4,8 +4,8 @@ REM # REM # This script assumes the machine has been prepared with the vmprep.cmd REM # script and will build the dependencies in the c:\db folder REM # -REM # If you find this script with a .txt extention, DO NOT RUN IT! vmprep will -REM # Download this and give it the right extention. +REM # If you find this script with a .txt extension, DO NOT RUN IT! vmprep will +REM # Download this and give it the right extension. REM ########################################################################### set CMAKE_GENERATOR_INSTANCE=c:\vs2019bt\ set CMAKE_GENERATOR=Visual Studio 16 2019 diff --git a/build_files/build_environment/windows/vmprep.cmd.txt b/build_files/build_environment/windows/vmprep.cmd.txt index b95a43bffe9..cae03795d3f 100644 --- a/build_files/build_environment/windows/vmprep.cmd.txt +++ b/build_files/build_environment/windows/vmprep.cmd.txt @@ -1,9 +1,9 @@ @echo off REM ########################################################################### REM # -REM # Note: This file has a .txt extention so it cannot be directly run from a +REM # Note: This file has a .txt extension so it cannot be directly run from a REM # blender source clone, it is meant to run on a clean windows install and -REM # nothing else. DO NOT REMOVE THE .TXT extention. See instructions below on +REM # nothing else. DO NOT REMOVE THE .TXT extension. See instructions below on REM # how to execute this script. REM # REM ########################################################################### @@ -44,13 +44,13 @@ echo # it has a short name to sidestep any long path issues. echo ########################################################################### echo # echo # Since this will download and install a whole bunch of stuff the following -echo # disclamer is seemingly required: +echo # disclaimer is seemingly required: echo # echo # ******* WARNING ******* echo # ******* WARNING ******* echo # echo # DO NOT RUN THIS ON ANYTHING BUT A CLEAN WINDOWS INSTALL, IF YOU DO, AND IT -echo # MESSES UP YOUR WORKSTATION, THATS ON YOU... +echo # MESSES UP YOUR WORKSTATION, THAT'S ON YOU... echo # echo # ******* WARNING ******* echo # ******* WARNING ******* diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 0f9d677a193..1b03c0fe81e 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -106,7 +106,7 @@ macro(file_list_suffix fp_list_new fp_list fn_suffix ) - # incase of empty list + # in case of empty list set(_fp) set(_fp_suffixed) @@ -350,7 +350,7 @@ function(blender_link_libraries # CMake have a native way of dealing with this, which is specifying what build type the # libraries are provided for: # - # target_link_libraries(tagret optimized|debug|general ) + # target_link_libraries(target optimized|debug|general ) # # The build type is to be provided as a separate argument to the function. # diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 209d0176611..fa21a27d1aa 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -92,7 +92,7 @@ if(WIN32) set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") - # Eventhough we no longer display this, we still need to set it otherwise it'll throw an error + # Even though we no longer display this, we still need to set it otherwise it'll throw an error # during the msi build. set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/license/spdx/GPL-3.0-or-later.txt) set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index be8a8470032..3e2b72c32fa 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -428,11 +428,11 @@ if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0) # Silence "ld: warning: ignoring duplicate libraries". # # The warning is introduced with Xcode 15 and is triggered when the same library - # is passed to the linker ultiple times. This situation could happen with either + # is passed to the linker multiple times. This situation could happen with either # cyclic libraries, or some transitive dependencies where CMake might decide to # pass library to the linker multiple times to force it re-scan symbols. It is - # not neeed for Xcode linker to ensure all symbols from library are used and it - # is corrected in CMake 3.29: + # not necessary for Xcode linker to ensure all symbols from library are used and + # it is corrected in CMake 3.29: # https://gitlab.kitware.com/cmake/cmake/-/issues/25297 string(APPEND PLATFORM_LINKFLAGS " -Xlinker -no_warn_duplicate_libraries") endif() diff --git a/build_files/cmake/testing.cmake b/build_files/cmake/testing.cmake index 7b04199663d..0c6a496303d 100644 --- a/build_files/cmake/testing.cmake +++ b/build_files/cmake/testing.cmake @@ -197,7 +197,7 @@ endfunction() # blender_add_test_suite_executable. # # The function accepts an optional argument which denotes list of sources which -# is to be compiled-in with the suite sources for each fo the suites when the +# is to be compiled-in with the suite sources for each of the suites when the # WITH_TESTS_SINGLE_BINARY configuration is set to OFF. function(blender_add_test_suite_lib name @@ -309,7 +309,7 @@ endfunction() # very large executable, blender_add_test_suite_lib() should be used instead. # # The function accepts an optional argument which denotes list of sources which -# is to be compiled-in with the suit sources for each fo the suites when the +# is to be compiled-in with the suit sources for each of the suites when the # WITH_TESTS_SINGLE_BINARY configuration is set to OFF. function(blender_add_test_suite_executable name diff --git a/build_files/windows/autopep8.cmd b/build_files/windows/autopep8.cmd index 0d7929b3c25..0d7678be2fb 100644 --- a/build_files/windows/autopep8.cmd +++ b/build_files/windows/autopep8.cmd @@ -11,7 +11,7 @@ for %%a in (%PYTHON%) do ( REM Use -B to avoid writing __pycache__ in lib directory and causing update conflicts. REM While we run with --no-subprocess a sub process is still used to get the version -REM information, so we stil have to supply a valid --autopep8-command here. +REM information, so we still have to supply a valid --autopep8-command here. %PYTHON% -B %FORMAT_PATHS% --autopep8-command "%PEP8_LOCATION%" --no-subprocess %FORMAT_ARGS% :EOF diff --git a/build_files/windows/detect_msvc_vswhere.cmd b/build_files/windows/detect_msvc_vswhere.cmd index 081f1ce9bdb..dc4a58abd27 100644 --- a/build_files/windows/detect_msvc_vswhere.cmd +++ b/build_files/windows/detect_msvc_vswhere.cmd @@ -56,7 +56,7 @@ if "%WITH_CLANG%" == "1" ( ) ) -REM This needs to be in a seperate block, due to no delayed expansion (which breaks other things if enabled) +REM This needs to be in a separate block, due to no delayed expansion (which breaks other things if enabled) if "%WITH_CLANG%" == "1" ( if NOT "%BUILD_WITH_NINJA%" == "1" ( if "%VSWhere_ClangFound%"=="" ( diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index 88c0fa6ba2b..c97e6405910 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -5,7 +5,7 @@ for %%X in (git.exe) do (set GIT=%%~$PATH:X) REM For python, default on 310 but if that does not exist also check REM the 311, 312 and finally 39 folders to see if those are there, it checks REM this far ahead to ensure good lib folder compatibility in the future -REM it falls back to 3.9 just incase it is a very old lib folder. +REM it falls back to 3.9 just in case it is a very old lib folder. set PYTHON=%BLENDER_DIR%\lib\windows_x64\python\310\bin\python.exe if EXIST %PYTHON% ( goto detect_python_done