From 7d5ef64bfb26825658f1a9e0485366e4b3568a0c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 19 Nov 2021 12:44:27 +0100 Subject: Cleanup: fix typos in comments and docs Contributed by luzpaz. Differential Revision: https://developer.blender.org/D13264 --- build_files/build_environment/cmake/harvest.cmake | 2 +- build_files/build_environment/cmake/options.cmake | 2 +- build_files/build_environment/cmake/package_python.cmake | 4 ++-- build_files/build_environment/install_deps.sh | 2 +- build_files/cmake/cmake_netbeans_project.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build_files') diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index a3740559adc..4d06430ea49 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -17,7 +17,7 @@ # ***** END GPL LICENSE BLOCK ***** ######################################################################## -# Copy all generated files to the proper strucure as blender prefers +# Copy all generated files to the proper structure as blender prefers ######################################################################## if(NOT DEFINED HARVEST_TARGET) diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 8930bd70fab..b37971be2a6 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -39,7 +39,7 @@ endif() set(DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads" CACHE STRING "Path for downloaded files") # This path must be hard-coded like this, so that the GNUmakefile knows where it is and can pass it to make_source_archive.py: set(PACKAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/packages") -option(PACKAGE_USE_UPSTREAM_SOURCES "Use soures upstream to download the package sources, when OFF the blender mirror will be used" ON) +option(PACKAGE_USE_UPSTREAM_SOURCES "Use sources upstream to download the package sources, when OFF the blender mirror will be used" ON) file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR) file(TO_CMAKE_PATH ${PACKAGE_DIR} PACKAGE_DIR) diff --git a/build_files/build_environment/cmake/package_python.cmake b/build_files/build_environment/cmake/package_python.cmake index 03184c783df..f5bf05dc024 100644 --- a/build_files/build_environment/cmake/package_python.cmake +++ b/build_files/build_environment/cmake/package_python.cmake @@ -24,7 +24,7 @@ if(MSVC) add_custom_command( OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe COMMAND echo packaging python - COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe + COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe @@ -43,7 +43,7 @@ if(MSVC) add_custom_command( OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe COMMAND echo packaging python - COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe + COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 2bb7175da00..24294df14ed 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1826,7 +1826,7 @@ compile_OCIO() { # Force linking against static libs #rm -f $_inst/lib/*.so* - # Additional depencencies + # Additional dependencies #cp ext/dist/lib/libtinyxml.a $_inst/lib #cp ext/dist/lib/libyaml-cpp.a $_inst/lib diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py index a16fc42c9b7..162fe1e2c06 100755 --- a/build_files/cmake/cmake_netbeans_project.py +++ b/build_files/cmake/cmake_netbeans_project.py @@ -180,7 +180,7 @@ def create_nb_project_main(): f.write(' \n') f.write(' \n') - # default, but this dir is infact not in blender dir so we can ignore it + # default, but this dir is in fact not in blender dir so we can ignore it # f.write(' ^(nbproject)$\n') f.write(r' ^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$\n') -- cgit v1.2.3