bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: sort file, uppercase booleans, add missing headers

Browse Source 
Also update files to ignore for check_cmake.
This commit is contained in:
Campbell Barton 2023-05-17 13:07:43 +10:00
parent 139f4981d4
commit 0099f51cdd
14 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
View File

@ -8,7 +8,7 @@
# It also supports non-standard names for the library components.
#
# To use a custom IlmBase:
# - Set the variable ILMBASE_CUSTOM to True
# - Set the variable ILMBASE_CUSTOM to TRUE
# - Set the variable ILMBASE_CUSTOM_LIBRARIES to a list of the libraries to
# use, e.g. "SpiImath SpiHalf SpiIlmThread SpiIex"
# - Optionally set the variable ILMBASE_CUSTOM_INCLUDE_DIR to any
@ -20,7 +20,7 @@
#
# ILMBASE_INCLUDE_DIR - where to find half.h, IlmBaseConfig.h, etc.
# ILMBASE_LIBRARIES - list of libraries to link against when using IlmBase.
# ILMBASE_FOUND - True if IlmBase was found.
# ILMBASE_FOUND - TRUE if IlmBase was found.
# Other standard issue macros
include(FindPackageHandleStandardArgs)

4
build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
View File

@ -8,7 +8,7 @@
# It also supports non-standard names for the library components.
#
# To use a custom OpenEXR
# - Set the variable OPENEXR_CUSTOM to True
# - Set the variable OPENEXR_CUSTOM to TRUE
# - Set the variable OPENEXR_CUSTOM_LIBRARY to the name of the library to
# use, e.g. "SpiIlmImf"
# - Optionally set the variable OPENEXR_CUSTOM_INCLUDE_DIR to any
@ -22,7 +22,7 @@
# OPENEXR_LIBRARIES - list of libraries to link against when using OpenEXR.
# This list does NOT include the IlmBase libraries.
# These are defined by the FindIlmBase module.
# OPENEXR_FOUND - True if OpenEXR was found.
# OPENEXR_FOUND - TRUE if OpenEXR was found.
# Other standard issue macros
include(SelectLibraryConfigurations)

6
build_files/cmake/platform/platform_unix.cmake
View File

@ -20,14 +20,14 @@ else()
# Choose the best suitable libraries.
if(EXISTS ${LIBDIR_NATIVE_ABI})
set(LIBDIR ${LIBDIR_NATIVE_ABI})
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND True)
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND TRUE)
elseif(EXISTS ${LIBDIR_GLIBC228_ABI})
set(LIBDIR ${LIBDIR_GLIBC228_ABI})
if(WITH_MEM_JEMALLOC)
# jemalloc provides malloc hooks.
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND False)
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND FALSE)
else()
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND True)
set(WITH_LIBC_MALLOC_HOOK_WORKAROUND TRUE)
endif()
endif()

4
build_files/cmake/platform/platform_win32.cmake
View File

@ -1034,7 +1034,7 @@ endif()
if(WITH_VULKAN_BACKEND)
if(EXISTS ${LIBDIR}/vulkan)
set(VULKAN_FOUND On)
set(VULKAN_FOUND ON)
set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan)
set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
@ -1048,7 +1048,7 @@ endif()
if(WITH_VULKAN_BACKEND)
if(EXISTS ${LIBDIR}/shaderc)
set(SHADERC_FOUND On)
set(SHADERC_FOUND ON)
set(SHADERC_ROOT_DIR ${LIBDIR}/shaderc)
set(SHADERC_INCLUDE_DIR ${SHADERC_ROOT_DIR}/include)
set(SHADERC_INCLUDE_DIRS ${SHADERC_INCLUDE_DIR})

2
intern/CMakeLists.txt
View File

@ -67,7 +67,7 @@ if(UNIX AND NOT APPLE)
add_subdirectory(libc_compat)
endif()
if (WITH_RENDERDOC)
if(WITH_RENDERDOC)
add_subdirectory(renderdoc_dynload)
endif()

4
intern/renderdoc_dynload/CMakeLists.txt
View File

@ -9,9 +9,9 @@ set(INC_SYS
)
set(SRC
intern/renderdoc_api.cc
intern/renderdoc_api.cc
include/renderdoc_api.hh
include/renderdoc_api.hh
)
blender_add_lib(bf_intern_renderdoc_dynload "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

2
source/blender/CMakeLists.txt
View File

@ -61,8 +61,8 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_pointcache_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_pointcloud_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_rigidbody_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_enums.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_screen_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sdna_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sequence_types.h

1
source/blender/blenkernel/CMakeLists.txt
View File

@ -443,6 +443,7 @@ set(SRC
BKE_multires.h
BKE_nla.h
BKE_node.h
BKE_node.hh
BKE_node_runtime.hh
BKE_node_tree_update.h
BKE_node_tree_zones.hh

1
source/blender/draw/CMakeLists.txt
View File

@ -273,6 +273,7 @@ set(SRC
engines/eevee_next/eevee_depth_of_field.hh
engines/eevee_next/eevee_engine.h
engines/eevee_next/eevee_film.hh
engines/eevee_next/eevee_gbuffer.hh
engines/eevee_next/eevee_hizbuffer.hh
engines/eevee_next/eevee_instance.hh
engines/eevee_next/eevee_irradiance_cache.hh

2
source/blender/gpencil_modifiers_legacy/CMakeLists.txt
View File

@ -31,7 +31,6 @@ set(INC_SYS
set(SRC
intern/MOD_gpencil_legacy_ui_common.c
intern/MOD_gpencil_legacy_util.c
intern/MOD_gpencil_legacy_armature.c
intern/MOD_gpencil_legacy_array.c
intern/MOD_gpencil_legacy_build.c
@ -56,6 +55,7 @@ set(SRC
intern/MOD_gpencil_legacy_thick.c
intern/MOD_gpencil_legacy_time.c
intern/MOD_gpencil_legacy_tint.c
intern/MOD_gpencil_legacy_util.c
intern/MOD_gpencil_legacy_weight_angle.c
intern/MOD_gpencil_legacy_weight_proximity.c

4
source/blender/gpu/CMakeLists.txt
View File

@ -216,8 +216,8 @@ set(VULKAN_SRC
vulkan/vk_index_buffer.cc
vulkan/vk_memory.cc
vulkan/vk_memory_layout.cc
vulkan/vk_pipeline_state.cc
vulkan/vk_pipeline.cc
vulkan/vk_pipeline_state.cc
vulkan/vk_pixel_buffer.cc
vulkan/vk_push_constants.cc
vulkan/vk_query.cc
@ -251,8 +251,8 @@ set(VULKAN_SRC
vulkan/vk_index_buffer.hh
vulkan/vk_memory.hh
vulkan/vk_memory_layout.hh
vulkan/vk_pipeline_state.hh
vulkan/vk_pipeline.hh
vulkan/vk_pipeline_state.hh
vulkan/vk_pixel_buffer.hh
vulkan/vk_push_constants.hh
vulkan/vk_query.hh

2
source/blender/io/usd/CMakeLists.txt
View File

@ -157,12 +157,12 @@ blender_add_lib(bf_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
if(WITH_GTESTS)
set(TEST_SRC
tests/usd_curves_test.cc
tests/usd_export_test.cc
tests/usd_stage_creation_test.cc
tests/usd_tests_common.cc
tests/usd_tests_common.h
tests/usd_usdz_export_test.cc
tests/usd_curves_test.cc
intern/usd_writer_material.h
)
if(USD_IMAGING_HEADERS)

2
tests/python/CMakeLists.txt
View File

@ -646,7 +646,7 @@ add_blender_test(
endif()
# SVG Import
if(True)
if(TRUE)
if(NOT OPENIMAGEIO_IDIFF)
message(WARNING "Disabling SVG tests because OIIO idiff does not exist")
else()

69
tools/check_source/check_cmake_consistency_config.py
View File

@ -2,17 +2,25 @@
import os
IGNORE_SOURCE = (
"/scripts/",
"/test/",
"/tests/gtests/",
"/release/",
# specific source files
# Specific source files.
"extern/audaspace/",
"extern/quadriflow/3rd/",
"extern/sdlew/include/",
"extern/mantaflow/",
"extern/Eigen3/",
# Use for `WIN32` only.
"source/creator/blender_launcher_win32.c",
# specific source files
# Pre-computed headers.
"source/blender/compositor/COM_precomp.h",
"source/blender/freestyle/FRS_precomp.h",
# Specific source files.
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
@ -22,20 +30,67 @@ IGNORE_SOURCE = (
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
"doc/doxygen/doxygen.extern.h",
"doc/doxygen/doxygen.intern.h",
"doc/doxygen/doxygen.main.h",
"doc/doxygen/doxygen.source.h",
# Specific source files.
"extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h",
"extern/bullet2/src/BulletCollision/CollisionShapes/btBox2dShape.h",
"extern/bullet2/src/BulletCollision/CollisionShapes/btConvex2dShape.h",
"extern/bullet2/src/BulletCollision/Gimpact/btContactProcessingStructs.h",
"extern/bullet2/src/BulletCollision/Gimpact/btGImpactBvhStructs.h",
"extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h",
"extern/bullet2/src/BulletCollision/Gimpact/gim_pair.h",
"extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btBatchedConstraints.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.h",
"extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
"extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h",
"extern/bullet2/src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyInplaceSolverIslandCallback.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h",
"extern/bullet2/src/BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.h",
"extern/bullet2/src/BulletSoftBody/DeformableBodyInplaceSolverIslandCallback.h",
"extern/bullet2/src/BulletSoftBody/btCGProjection.h",
"extern/bullet2/src/BulletSoftBody/btConjugateGradient.h",
"extern/bullet2/src/BulletSoftBody/btConjugateResidual.h",
"extern/bullet2/src/BulletSoftBody/btDeformableBackwardEulerObjective.h",
"extern/bullet2/src/BulletSoftBody/btDeformableBodySolver.h",
"extern/bullet2/src/BulletSoftBody/btDeformableContactConstraint.h",
"extern/bullet2/src/BulletSoftBody/btDeformableContactProjection.h",
"extern/bullet2/src/BulletSoftBody/btDeformableCorotatedForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableGravityForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableLagrangianForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableLinearElasticityForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableMassSpringForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableMousePickingForce.h",
"extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.h",
"extern/bullet2/src/BulletSoftBody/btDeformableMultiBodyDynamicsWorld.h",
"extern/bullet2/src/BulletSoftBody/btDeformableNeoHookeanForce.h",
"extern/bullet2/src/BulletSoftBody/btKrylovSolver.h",
"extern/bullet2/src/BulletSoftBody/btPreconditioner.h",
"extern/bullet2/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h",
"extern/bullet2/src/BulletSoftBody/poly34.h",
"extern/bullet2/src/LinearMath/TaskScheduler/btThreadSupportInterface.h",
"extern/bullet2/src/LinearMath/btImplicitQRSVD.h",
"extern/bullet2/src/LinearMath/btModifiedGramSchmidt.h",
"extern/bullet2/src/LinearMath/btReducedVector.h",
"extern/bullet2/src/LinearMath/btThreads.h",
"doc/doxygen/doxygen.extern.h",
"doc/doxygen/doxygen.intern.h",
"doc/doxygen/doxygen.main.h",
"doc/doxygen/doxygen.source.h",
"build_files/build_environment/patches/config_gmpxx.h",
# These could be included but are not part of Blender's core.
"intern/libmv/libmv/multiview/test_data_sets.h",
)
# Ignore cmake file, path pairs.