ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup: bad indentation for CMake files

Browse source 
Ref !157497
This commit is contained in:
Campbell Barton 2026-04-17 09:46:02 +00:00
parent e51da38961
commit 89a8ba391e
6 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

46
build_files/build_environment/cmake/aom.cmake
View file

@ -48,7 +48,7 @@ if(WIN32)
BUILD_COMMAND ${CMAKE_COMMAND} --build .
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
INSTALL_DIR ${LIBDIR}/aom
)
)
else()
ExternalProject_Add(external_aom
URL file://${PACKAGE_DIR}/${AOM_FILE}
@ -73,26 +73,26 @@ endif()
if(NOT WIN32)
harvest(external_aom aom/lib ffmpeg/lib "*.a")
else()
if(BUILD_MODE STREQUAL Release)
# aom insists on building a static version even if you
# do not want it, get rid of it by copying the import lib
# on top of it, so other projects don't accidentally link
# the static library.
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/aom/
${HARVEST_TARGET}/aom/
DEPENDEES install
)
else()
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
DEPENDEES install
)
endif()
if(BUILD_MODE STREQUAL Release)
# aom insists on building a static version even if you
# do not want it, get rid of it by copying the import lib
# on top of it, so other projects don't accidentally link
# the static library.
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/aom/
${HARVEST_TARGET}/aom/
DEPENDEES install
)
else()
ExternalProject_Add_Step(external_aom after_install
COMMAND ${CMAKE_COMMAND} -E copy
${LIBDIR}/aom/lib/aom_dll.lib
${LIBDIR}/aom/lib/aom.lib
DEPENDEES install
)
endif()
endif()

12
build_files/build_environment/cmake/fmt.cmake
View file

@ -22,13 +22,13 @@ ExternalProject_Add(external_fmt
)
if(WIN32)
ExternalProject_Add_Step(external_fmt after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/fmt/
${HARVEST_TARGET}/fmt
ExternalProject_Add_Step(external_fmt after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory
${LIBDIR}/fmt/
${HARVEST_TARGET}/fmt
DEPENDEES install
)
DEPENDEES install
)
else()
harvest(external_fmt fmt/include fmt/include "*.h")

2
build_files/build_environment/cmake/llvm.cmake
View file

@ -60,7 +60,7 @@ if(WIN32)
${PATCH_CMD} -p 1 -d
${BUILD_DIR}/llvm/src/external_llvm <
${PATCH_DIR}/llvm_clang_cuda_msvc_header_fix.diff
)
)
else()
set(LLVM_GENERATOR "Unix Makefiles")
endif()

10
build_files/build_environment/cmake/python_site_packages.cmake
View file

@ -17,11 +17,11 @@ else()
endif()
set(PIP_CONSTRAINT_FILE ${BUILD_DIR}/constraints.txt)
# setuptools-scm is causing issues with their latest version
# issue: https://github.com/pypa/setuptools-scm/issues/1316
# but pinning it doesn't work since downstream package dependencies
# also seem to resolve the later versions
# we can alter this behaviour by using pip constraints
# setuptools-scm is causing issues with their latest version
# issue: https://github.com/pypa/setuptools-scm/issues/1316
# but pinning it doesn't work since downstream package dependencies
# also seem to resolve the later versions
# we can alter this behaviour by using pip constraints
file(WRITE ${PIP_CONSTRAINT_FILE}
"setuptools-scm==${SETUPTOOLS_SCM_VERSION}\n"
)

10
build_files/build_environment/cmake/vpx.cmake
View file

@ -59,11 +59,11 @@ else()
set(VPX_EXTRA_FLAGS --target=x86_64-darwin17-gcc)
endif()
else()
if(NOT BLENDER_PLATFORM_ARM)
set(VPX_EXTRA_FLAGS --target=x86_64-linux-gcc)
else()
set(VPX_EXTRA_FLAGS --target=generic-gnu)
endif()
if(NOT BLENDER_PLATFORM_ARM)
set(VPX_EXTRA_FLAGS --target=x86_64-linux-gcc)
else()
set(VPX_EXTRA_FLAGS --target=generic-gnu)
endif()
endif()
set(VPX_CONFIGURE_COMMAND ${CONFIGURE_ENV})

12
tests/python/CMakeLists.txt
View file

@ -879,14 +879,14 @@ if((WITH_CYCLES OR WITH_GPU_RENDER_TESTS) AND TEST_SRC_DIR_EXISTS)
if(WITH_FREESTYLE)
list(APPEND render_tests render_layer)
list(APPEND workbench_tests render_layer)
endif()
if(WITH_MOD_FLUID)
endif()
if(WITH_MOD_FLUID)
list(APPEND render_tests motion_blur reports volume)
list(APPEND workbench_tests volume)
endif()
if(WITH_OPENVDB AND WITH_MOD_FLUID)
endif()
if(WITH_OPENVDB AND WITH_MOD_FLUID)
# Some tests in the OpenVDB folder make use of fluid simulations to generate smoke
list(APPEND render_tests openvdb)
list(APPEND workbench_tests openvdb)