66224d69b0
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
76 lines
2.2 KiB
CMake
76 lines
2.2 KiB
CMake
# SPDX-FileCopyrightText: 2017-2023 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
# Note the encoder/decoder may use png/tiff/lcms system libraries, but the
|
|
# library itself does not depend on them, so should give no problems.
|
|
|
|
if(NOT WIN32)
|
|
set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
|
|
|
|
set(OPENJPEG_EXTRA_ARGS
|
|
${OPENJPEG_EXTRA_ARGS}
|
|
-DBUILD_SHARED_LIBS=OFF
|
|
-DBUILD_CODEC=OFF
|
|
)
|
|
|
|
ExternalProject_Add(external_openjpeg
|
|
URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
|
|
PREFIX ${BUILD_DIR}/openjpeg
|
|
|
|
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
|
|
cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build &&
|
|
${CMAKE_COMMAND}
|
|
${OPENJPEG_EXTRA_ARGS}
|
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg
|
|
${BUILD_DIR}/openjpeg/src/external_openjpeg
|
|
|
|
BUILD_COMMAND ${CONFIGURE_ENV} &&
|
|
cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ &&
|
|
make -j${MAKE_THREADS}
|
|
|
|
INSTALL_COMMAND ${CONFIGURE_ENV} &&
|
|
cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ &&
|
|
make install
|
|
|
|
INSTALL_DIR ${LIBDIR}/openjpeg
|
|
)
|
|
|
|
harvest(external_openjpeg openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} openjpeg/include "*.h")
|
|
harvest(external_openjpeg openjpeg/lib openjpeg/lib "*.a")
|
|
else()
|
|
set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
|
|
ExternalProject_Add(external_openjpeg_msvc
|
|
URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
|
|
|
|
PREFIX ${BUILD_DIR}/openjpeg_msvc
|
|
|
|
CMAKE_ARGS
|
|
${OPENJPEG_EXTRA_ARGS}
|
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc
|
|
-DBUILD_SHARED_LIBS=Off
|
|
-DBUILD_THIRDPARTY=OFF
|
|
|
|
INSTALL_DIR ${LIBDIR}/openjpeg_msvc
|
|
)
|
|
if(BUILD_MODE STREQUAL Release)
|
|
ExternalProject_Add_Step(external_openjpeg_msvc after_install
|
|
COMMAND
|
|
${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/openjpeg_msvc/lib
|
|
${HARVEST_TARGET}/openjpeg/lib &&
|
|
${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/openjpeg_msvc/include
|
|
${HARVEST_TARGET}/openjpeg/include
|
|
|
|
DEPENDEES install
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
|