[Bf-blender-cvs] [f6e594f1ee2] soc-2021-uv-editor-improvements: Cleanup: tab indentation for CMake / GNUmakefile
Campbell Barton
noreply at git.blender.org
Mon Aug 9 03:24:45 CEST 2021
Commit: f6e594f1ee2425b7e840a3ff22fb708b46c44542
Author: Campbell Barton
Date: Thu Aug 5 12:02:49 2021 +1000
Branches: soc-2021-uv-editor-improvements
https://developer.blender.org/rBf6e594f1ee2425b7e840a3ff22fb708b46c44542
Cleanup: tab indentation for CMake / GNUmakefile
===================================================================
M GNUmakefile
M build_files/cmake/platform/platform_win32.cmake
M extern/CMakeLists.txt
M source/blender/compositor/CMakeLists.txt
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index 635cc321d03..d620e5c4363 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -63,7 +63,7 @@ Package Targets
* package_debian: Build a debian package.
* package_pacman: Build an arch linux pacman package.
- * package_archive: Build an archive package.
+ * package_archive: Build an archive package.
Testing Targets
Not associated with building Blender.
@@ -167,7 +167,7 @@ endef
# This makefile is not meant for Windows
ifeq ($(OS),Windows_NT)
- $(error On Windows, use "cmd //c make.bat" instead of "make")
+ $(error On Windows, use "cmd //c make.bat" instead of "make")
endif
# System Vars
@@ -379,7 +379,7 @@ deps: .FORCE
@cmake -H"$(DEPS_SOURCE_DIR)" \
-B"$(DEPS_BUILD_DIR)" \
- -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
+ -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
@echo
@echo Building dependencies ...
@@ -456,7 +456,8 @@ project_eclipse: .FORCE
check_cppcheck: .FORCE
$(CMAKE_CONFIG)
cd "$(BUILD_DIR)" ; \
- $(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
+ $(PYTHON) \
+ "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
"$(BLENDER_DIR)/check_cppcheck.txt"
@echo "written: check_cppcheck.txt"
@@ -518,8 +519,9 @@ source_archive: .FORCE
python3 ./build_files/utils/make_source_archive.py
source_archive_complete: .FORCE
- cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
- -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
+ cmake \
+ -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
+ -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
# This assumes CMake is still using a default `PACKAGE_DIR` variable:
python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
@@ -527,11 +529,11 @@ source_archive_complete: .FORCE
INKSCAPE_BIN?="inkscape"
icons: .FORCE
BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
- "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+ "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
INKSCAPE_BIN=$(INKSCAPE_BIN) \
- "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
+ "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
INKSCAPE_BIN=$(INKSCAPE_BIN) \
- "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
+ "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
icons_geom: .FORCE
BLENDER_BIN=$(BLENDER_BIN) \
@@ -545,7 +547,7 @@ update_code: .FORCE
format: .FORCE
PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
- $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
+ $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
# -----------------------------------------------------------------------------
@@ -555,8 +557,9 @@ format: .FORCE
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py: .FORCE
ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
- $(BLENDER_BIN) --background -noaudio --factory-startup \
- --python doc/python_api/sphinx_doc_gen.py
+ $(BLENDER_BIN) \
+ --background -noaudio --factory-startup \
+ --python doc/python_api/sphinx_doc_gen.py
sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
@@ -565,8 +568,9 @@ doc_doxy: .FORCE
@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
doc_dna: .FORCE
- $(BLENDER_BIN) --background -noaudio --factory-startup \
- --python doc/blender_file_format/BlendFileDnaExporter_25.py
+ $(BLENDER_BIN) \
+ --background -noaudio --factory-startup \
+ --python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
doc_man: .FORCE
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index a0e91199c72..113c41c545b 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -217,8 +217,8 @@ else()
endif()
if(WITH_WINDOWS_PDB)
- set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
- set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+ set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
+ set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
endif()
string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MDd ${SYMBOL_FORMAT}")
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 824b2fb0e9c..7f7d91f0765 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -111,5 +111,5 @@ if(WITH_MOD_FLUID)
endif()
if (WITH_COMPOSITOR)
- add_subdirectory(smaa_areatex)
+ add_subdirectory(smaa_areatex)
endif()
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 000ba298c2d..ee287c65fe9 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -597,16 +597,16 @@ add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
set(GENSRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/operations)
set(GENSRC ${GENSRC_DIR}/COM_SMAAAreaTexture.h)
add_custom_command(
- OUTPUT ${GENSRC}
- COMMAND ${CMAKE_COMMAND} -E make_directory ${GENSRC_DIR}
- COMMAND "$<TARGET_FILE:smaa_areatex>" ${GENSRC}
- DEPENDS smaa_areatex
+ OUTPUT ${GENSRC}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${GENSRC_DIR}
+ COMMAND "$<TARGET_FILE:smaa_areatex>" ${GENSRC}
+ DEPENDS smaa_areatex
)
add_custom_target(smaa_areatex_header
- SOURCES ${GENSRC}
+ SOURCES ${GENSRC}
)
list(APPEND SRC
- ${GENSRC}
+ ${GENSRC}
)
unset(GENSRC)
unset(GENSRC_DIR)
@@ -650,4 +650,3 @@ if(WITH_GTESTS)
include(GTestTesting)
blender_add_test_lib(bf_compositor_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
endif()
-
More information about the Bf-blender-cvs
mailing list