This commit includes the changes to the build system, updated hashes to the actual new libraries as well as a required test update. * DPC++ 6.2.0 RC * freetype 2.13.3 * HIP 6.4.5010 * IGC 2.16.0 * ISPC 1.28.0 * libharu 2.4.5 * libpng 1.6.50 * libvpx 1.15.2 * libxml2 2.14.5 * LLVM 20.1.8 * Manifold 3.2.1 * MaterialX 1.39.3 * OpenColorIO 2.4.2 * openexr 3.3.5 * OpenImageIO 3.0.9.1 * openjpeg 2.5.3 * OpenShadingLanguage 1.14.7.0 * openssl 3.5.2 * Python 3.11.13 * Rubber Band 4.0.0 * ShaderC 2025.3 * sqlite 3.50.4 * USD 25.08 * Wayland 1.24.0 Ref #138940 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Jesse Yurkovich <jesse.y@gmail.com> Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Sybren A. Stüvel <sybren@blender.org> Co-authored-by: Kace <lakacey03@gmail.com> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Pull Request: https://projects.blender.org/blender/blender/pulls/144479
154 lines
4.7 KiB
CMake
154 lines
4.7 KiB
CMake
# SPDX-FileCopyrightText: 2017-2023 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
# Note the utility apps may use png/tiff/gif system libraries, but the
|
|
# library itself does not depend on them, so should give no problems.
|
|
|
|
set(EMBREE_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
|
|
|
|
set(EMBREE_EXTRA_ARGS
|
|
-DEMBREE_ISPC_SUPPORT=OFF
|
|
-DEMBREE_TUTORIALS=OFF
|
|
-DEMBREE_STATIC_LIB=OFF
|
|
-DEMBREE_RAY_MASK=ON
|
|
-DEMBREE_FILTER_FUNCTION=ON
|
|
-DEMBREE_BACKFACE_CULLING=OFF
|
|
-DEMBREE_BACKFACE_CULLING_CURVES=ON
|
|
-DEMBREE_BACKFACE_CULLING_SPHERES=ON
|
|
-DEMBREE_NO_SPLASH=ON
|
|
-DEMBREE_TASKING_SYSTEM=TBB
|
|
-DEMBREE_TBB_ROOT=${LIBDIR}/tbb
|
|
-DTBB_ROOT=${LIBDIR}/tbb
|
|
)
|
|
|
|
if(WIN32)
|
|
set(EMBREE_EXTRA_ARGS
|
|
${EMBREE_EXTRA_ARGS}
|
|
-DCMAKE_DEBUG_POSTFIX=_d
|
|
)
|
|
endif()
|
|
|
|
if(NOT BLENDER_PLATFORM_ARM)
|
|
set(EMBREE_EXTRA_ARGS
|
|
${EMBREE_EXTRA_ARGS}
|
|
-DEMBREE_MAX_ISA=AVX2
|
|
)
|
|
endif()
|
|
|
|
if(NOT APPLE AND NOT BLENDER_PLATFORM_ARM)
|
|
if(WIN32)
|
|
# Levels below -O2 don't work well for Embree+SYCL.
|
|
string(REGEX REPLACE "-O[A-Za-z0-9]" "" EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG ${BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG})
|
|
string(APPEND EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG " -O2")
|
|
string(REGEX REPLACE "-O[A-Za-z0-9]" "" EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG ${BLENDER_CLANG_CMAKE_C_FLAGS_DEBUG})
|
|
string(APPEND EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG " -O2")
|
|
set(EMBREE_CMAKE_FLAGS
|
|
-DCMAKE_BUILD_TYPE=${BUILD_MODE}
|
|
-DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CLANG_CMAKE_CXX_FLAGS_RELEASE}
|
|
-DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CLANG_CMAKE_CXX_FLAGS_MINSIZEREL}
|
|
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${BLENDER_CLANG_CMAKE_CXX_FLAGS_RELWITHDEBINFO}
|
|
-DCMAKE_CXX_FLAGS_DEBUG=${EMBREE_CLANG_CMAKE_CXX_FLAGS_DEBUG}
|
|
-DCMAKE_C_FLAGS_RELEASE=${BLENDER_CLANG_CMAKE_C_FLAGS_RELEASE}
|
|
-DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CLANG_CMAKE_C_FLAGS_MINSIZEREL}
|
|
-DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CLANG_CMAKE_C_FLAGS_RELWITHDEBINFO}
|
|
-DCMAKE_C_FLAGS_DEBUG=${EMBREE_CLANG_CMAKE_C_FLAGS_DEBUG}
|
|
-DCMAKE_CXX_STANDARD=17
|
|
)
|
|
set(EMBREE_EXTRA_ARGS
|
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
|
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
|
|
-DCMAKE_SHARED_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
|
|
-DEMBREE_SYCL_SUPPORT=ON
|
|
${EMBREE_EXTRA_ARGS}
|
|
)
|
|
else()
|
|
set(EMBREE_EXTRA_ARGS
|
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++
|
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang
|
|
-DCMAKE_SHARED_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
|
|
-DEMBREE_SYCL_SUPPORT=ON
|
|
${EMBREE_EXTRA_ARGS}
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
if(TBB_STATIC_LIBRARY)
|
|
set(EMBREE_EXTRA_ARGS
|
|
${EMBREE_EXTRA_ARGS}
|
|
-DEMBREE_TBB_COMPONENT=tbb_static
|
|
)
|
|
endif()
|
|
|
|
ExternalProject_Add(external_embree
|
|
URL file://${PACKAGE_DIR}/${EMBREE_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
|
|
CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
|
|
PREFIX ${BUILD_DIR}/embree
|
|
|
|
PATCH_COMMAND
|
|
${PATCH_CMD} -p 1 -d
|
|
${BUILD_DIR}/embree/src/external_embree <
|
|
${PATCH_DIR}/embree.diff
|
|
|
|
CMAKE_ARGS
|
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree
|
|
${EMBREE_CMAKE_FLAGS}
|
|
${EMBREE_EXTRA_ARGS}
|
|
|
|
INSTALL_DIR ${LIBDIR}/embree
|
|
)
|
|
|
|
if(NOT APPLE AND NOT BLENDER_PLATFORM_ARM)
|
|
add_dependencies(
|
|
external_embree
|
|
external_tbb
|
|
external_dpcpp
|
|
)
|
|
else()
|
|
add_dependencies(
|
|
external_embree
|
|
external_tbb
|
|
)
|
|
endif()
|
|
|
|
if(WIN32)
|
|
if(BUILD_MODE STREQUAL Release)
|
|
ExternalProject_Add_Step(external_embree after_install
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/embree/include
|
|
${HARVEST_TARGET}/embree/include
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/embree/lib
|
|
${HARVEST_TARGET}/embree/lib
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/embree/share
|
|
${HARVEST_TARGET}/embree/share
|
|
COMMAND ${CMAKE_COMMAND} -E copy
|
|
${LIBDIR}/embree/bin/embree4.dll
|
|
${HARVEST_TARGET}/embree/bin/embree4.dll
|
|
|
|
DEPENDEES install
|
|
)
|
|
else()
|
|
ExternalProject_Add_Step(external_embree after_install
|
|
COMMAND ${CMAKE_COMMAND} -E copy
|
|
${LIBDIR}/embree/bin/embree4_d.dll
|
|
${HARVEST_TARGET}/embree/bin/embree4_d.dll
|
|
COMMAND ${CMAKE_COMMAND} -E copy
|
|
${LIBDIR}/embree/lib/embree4_d.lib
|
|
${HARVEST_TARGET}/embree/lib/embree4_d.lib
|
|
COMMAND ${CMAKE_COMMAND} -E copy
|
|
${LIBDIR}/embree/lib/embree4_sycl_d.lib
|
|
${HARVEST_TARGET}/embree/lib/embree4_sycl_d.lib
|
|
|
|
DEPENDEES install
|
|
)
|
|
endif()
|
|
else()
|
|
harvest(external_embree embree/include embree/include "*.h")
|
|
harvest(external_embree embree/lib embree/lib "*.a")
|
|
harvest_rpath_lib(external_embree embree/lib embree/lib "*${SHAREDLIBEXT}*")
|
|
endif()
|