griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: correct typos in GNUmakefile & CMakeLists.txt

Browse Source 
Ref !145814
This commit is contained in:
luz paz
2025-09-05 21:45:12 +02:00
committed by Campbell Barton
parent f7cdd3e867
commit d18e0cb573
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -1779,7 +1779,7 @@ Keep at '0' to automatically compute optimal values for each build."
endif() endif()
if(${_link_jobs} LESS 1) if(${_link_jobs} LESS 1)
# Heuristics: Maximum amount of memory needed per linking task. # Heuristics: Maximum amount of memory needed per linking task.
# Note: These values are purposedly over-estimated by 10-15% at least, to account # Note: These values are purposely over-estimated by 10-15% at least, to account
# for other types of jobs' memory usage, other system memory usages, etc. # for other types of jobs' memory usage, other system memory usages, etc.
set(_link_mem 10000) set(_link_mem 10000)
if(WITH_COMPILER_ASAN) if(WITH_COMPILER_ASAN)
@@ -1826,7 +1826,7 @@ Keep at '0' to automatically compute optimal values for each build."
endif() endif()
if(${_compile_heavy_jobs} LESS 1) if(${_compile_heavy_jobs} LESS 1)
# Heuristics: Maximum amount of memory needed per heavy compile task. # Heuristics: Maximum amount of memory needed per heavy compile task.
# Note: These values are purposedly over-estimated by 10-15% at least, to account # Note: These values are purposely over-estimated by 10-15% at least, to account
# for other types of jobs' memory usage, other system memory usages, etc. # for other types of jobs' memory usage, other system memory usages, etc.
set(_compile_heavy_mem 2000) set(_compile_heavy_mem 2000)
if(WITH_COMPILER_ASAN) if(WITH_COMPILER_ASAN)
@@ -2150,7 +2150,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
CXX_WARN_ERROR_UNGUARDED_AVAILABILITY_NEW -Werror=unguarded-availability-new CXX_WARN_ERROR_UNGUARDED_AVAILABILITY_NEW -Werror=unguarded-availability-new
) )
if(MSVC_CLANG) if(MSVC_CLANG)
# clang-cl produces an unhealthy ammount of warnings in its default # clang-cl produces an unhealthy amount of warnings in its default
# configuration as it for reasons unknown decided to enable all # configuration as it for reasons unknown decided to enable all
# warnings known to mankind. Resulting in a 5.5GB build log containing # warnings known to mankind. Resulting in a 5.5GB build log containing
# well over 11 million warnings. The code below disables every single # well over 11 million warnings. The code below disables every single
@@ -2165,7 +2165,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
# /W3 is being removed, then added back again, this is because order # /W3 is being removed, then added back again, this is because order
# matters for clang and these flags are being placed before the # matters for clang and these flags are being placed before the
# CMAKE_[LANGUAGE]_FLAGS which normally contain /W3, so we would # CMAKE_[LANGUAGE]_FLAGS which normally contain /W3, so we would
# disable certain warings here only for them to be re-enabled by /W3 # disable certain warnings here only for them to be re-enabled by /W3
# later on. # later on.
remove_cc_flag("/W3") remove_cc_flag("/W3")

12
GNUmakefile
View File

@@ -24,7 +24,7 @@ Blender Convenience Targets
* ccache: Use ccache for faster rebuilds. * ccache: Use ccache for faster rebuilds.
Note: when passing in multiple targets their order is not important. Note: when passing in multiple targets their order is not important.
For example, fo a fast build you can run 'make lite ccache ninja'. For example, for a fast build you can run 'make lite ccache ninja'.
Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir. Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments. Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
@@ -84,7 +84,7 @@ Documentation Checking
See: https://developer.blender.org/docs/features/code_layout/ See: https://developer.blender.org/docs/features/code_layout/
Spell Checkers Spell Checkers
This runs the spell checker from the developer tools repositor. This runs the spell checker from the developer tools repository.
* check_spelling_c: Check for spelling errors (C/C++ only), * check_spelling_c: Check for spelling errors (C/C++ only),
* check_spelling_py: Check for spelling errors (Python only). * check_spelling_py: Check for spelling errors (Python only).
@@ -99,7 +99,7 @@ Spell Checkers
Example: Example:
make check_spelling_c CHECK_SPELLING_CACHE=../spelling_cache.data make check_spelling_c CHECK_SPELLING_CACHE=../spelling_cache.data
Note: additonal arguments can be passed in via: 'CHECK_SPELLING_EXTRA_ARGS'. Note: additional arguments can be passed in via: 'CHECK_SPELLING_EXTRA_ARGS'.
See the output of './tools/check_source/check_spelling.py --help' for details. See the output of './tools/check_source/check_spelling.py --help' for details.
Utilities Utilities
@@ -133,7 +133,7 @@ Utilities
* license: * license:
Create a combined file with all the license information relative to the libraries and other Create a combined file with all the license information relative to the libraries and other
code depedencies. code dependencies.
Environment Variables Environment Variables
@@ -241,7 +241,7 @@ endif
# Allow to use alternative binary (pypy3, etc) # Allow to use alternative binary (pypy3, etc)
ifndef PYTHON ifndef PYTHON
# If not overriden, first try using Python from LIBDIR. # If not overridden, first try using Python from LIBDIR.
PYTHON:=$(LIBDIR)/python/bin/python$(PY_LIB_VERSION) PYTHON:=$(LIBDIR)/python/bin/python$(PY_LIB_VERSION)
ifeq (, $(wildcard $(PYTHON))) ifeq (, $(wildcard $(PYTHON)))
# If not available, use system python3 or python command. # If not available, use system python3 or python command.
@@ -399,7 +399,7 @@ all: .FORCE
# # $(CMAKE_CONFIG); \ # # $(CMAKE_CONFIG); \
# # fi # # fi
# # do this always incase of failed initial build, could be smarter here... # # do this always in case of failed initial build, could be smarter here...
@$(CMAKE_CONFIG) @$(CMAKE_CONFIG)
@echo @echo