From bdf71f48b8a916a6bec68624e9375b482a49f7ac Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Tue, 27 Oct 2026 13:28:47 +0100 Subject: [PATCH 1/2] [cmake] lzma, zlib, zstd, jpeg: prefixes visible in the parent scope --- builtins/libjpeg/CMakeLists.txt | 1 + builtins/lzma/CMakeLists.txt | 1 + builtins/zlib/CMakeLists.txt | 2 +- builtins/zstd/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/builtins/libjpeg/CMakeLists.txt b/builtins/libjpeg/CMakeLists.txt index 494f7ad02115a..465c77557fa61 100644 --- a/builtins/libjpeg/CMakeLists.txt +++ b/builtins/libjpeg/CMakeLists.txt @@ -66,3 +66,4 @@ set(JPEG_INCLUDE_DIRS ${ROOT_LIBJPEG_PREFIX}/include PARENT_SCOPE) set(JPEG_LIBRARIES ${ROOT_LIBJPEG_LIBRARY} PARENT_SCOPE) set(JPEG_FOUND TRUE PARENT_SCOPE) set(JPEG_VERSION ${ROOT_LIBJPEG_VERSION} PARENT_SCOPE) +set(ROOT_LIBJPEG_PREFIX ${ROOT_LIBJPEG_PREFIX} PARENT_SCOPE) diff --git a/builtins/lzma/CMakeLists.txt b/builtins/lzma/CMakeLists.txt index 2cf6997c32f7f..fde0066ebfdf7 100644 --- a/builtins/lzma/CMakeLists.txt +++ b/builtins/lzma/CMakeLists.txt @@ -80,3 +80,4 @@ set(LIBLZMA_INCLUDE_DIRS ${LibLZMA_INCLUDE_DIR} PARENT_SCOPE) set(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARIES} PARENT_SCOPE) set(LibLZMA_FOUND TRUE PARENT_SCOPE) set(LibLZMA_VERSION ${ROOT_LZMA_VERSION} PARENT_SCOPE) +set(ROOT_LZMA_PREFIX ${ROOT_LZMA_PREFIX} PARENT_SCOPE) diff --git a/builtins/zlib/CMakeLists.txt b/builtins/zlib/CMakeLists.txt index 4d4f75acd416e..624b55a1ae8f1 100644 --- a/builtins/zlib/CMakeLists.txt +++ b/builtins/zlib/CMakeLists.txt @@ -9,7 +9,6 @@ set(ROOT_ZLIB_VERSION 1.3.2) set(ROOT_ZLIB_HASH "bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16") -set(ROOT_ZLIB_PREFIX ${CMAKE_BINARY_DIR}/builtins/ZLIB-prefix PARENT_SCOPE) set(ROOT_ZLIB_PREFIX ${CMAKE_BINARY_DIR}/builtins/ZLIB-prefix) # Here we need two cases because the library has two different names on Linux/macOS and Windows @@ -74,6 +73,7 @@ set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} PARENT_SCOPE) set(ZLIB_LIBRARIES ${ROOT_ZLIB_LIBRARY} PARENT_SCOPE) set(ZLIB_FOUND TRUE PARENT_SCOPE) set(ZLIB_VERSION ${ROOT_ZLIB_VERSION} PARENT_SCOPE) +set(ROOT_ZLIB_PREFIX ${ROOT_ZLIB_PREFIX} PARENT_SCOPE) # The following variables can be set by users to override the behaviour of FindZLIB.cmake, # so packages executing their own find_package(ZLIB) will find the builtin library. diff --git a/builtins/zstd/CMakeLists.txt b/builtins/zstd/CMakeLists.txt index 8297a3cb4469d..f13d90b0c2af3 100644 --- a/builtins/zstd/CMakeLists.txt +++ b/builtins/zstd/CMakeLists.txt @@ -73,3 +73,4 @@ set(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR} PARENT_SCOPE) set(ZSTD_LIBRARIES ${ROOT_ZSTD_LIBRARY} PARENT_SCOPE) set(ZSTD_FOUND TRUE PARENT_SCOPE) set(ZSTD_VERSION ${ROOT_ZSTD_VERSION} PARENT_SCOPE) +set(ROOT_ZSTD_PREFIX ${ROOT_ZSTD_PREFIX} PARENT_SCOPE) From dc6a454af936dd6a261f7801e922eb7bc3fbf868 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Tue, 27 Oct 2026 13:30:07 +0100 Subject: [PATCH 2/2] [builtins] Update libtiff to 4.7.2 and simplify CMakeLists by setting the CMake "Package_ROOT" variables only --- README/ReleaseNotes/v642/index.md | 2 +- builtins/libtiff/CMakeLists.txt | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index fdd458aea1721..10f558e0294d4 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -412,7 +412,7 @@ The version of the following packages has been updated: - libmathtext: 2016 - libpng: 1.6.59 - libjpeg-turbo: 3.2.0 - - libtiff: 4.7.26 + - libtiff: 4.7.2 - openssl: 3.5.9 - openui5: 1.152.0 - pcre: now pcre2, version 10.47 diff --git a/builtins/libtiff/CMakeLists.txt b/builtins/libtiff/CMakeLists.txt index abd1f8c7474ae..9fe7ce6ebed3b 100644 --- a/builtins/libtiff/CMakeLists.txt +++ b/builtins/libtiff/CMakeLists.txt @@ -5,9 +5,9 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. # **PLEASE UPDATE ALSO THE FOLLOWING LINE WHEN UPDATING THE VERSION** -# 18 Sep 2024, https://github.com/libsdl-org/libtiff/releases/tag/v4.7.0 -set(ROOT_LIBTIFF_VERSION 4.7.0) -set(ROOT_LIBTIFF_HASH "67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976") +# 3 Jul 2026, https://github.com/libsdl-org/libtiff/releases/tag/v4.7.2 +set(ROOT_LIBTIFF_VERSION 4.7.2) +set(ROOT_LIBTIFF_HASH "dd030ae5d6483033bd88d840fc97e36adc3022b844d9d896a3b5a50f2d660d6f") set(ROOT_LIBTIFF_PREFIX ${CMAKE_BINARY_DIR}/builtins/LIBTIFF-prefix) if(MSVC) @@ -39,16 +39,16 @@ if(builtin_lzma) set(LZMA_ROOT_OPTION "-DLIBLZMA_ROOT=${ROOT_LZMA_PREFIX}") endif() if(builtin_jpeg) - set(JPEG_ROOT_OPTION "-DJPEG_ROOT=${ROOT_LIBJPEG_PREFIX}") + set(JPEG_ROOT_OPTION "-Dlibjpeg-turbo_ROOT=${ROOT_LIBJPEG_PREFIX}") endif() ExternalProject_Add( BUILTIN_LIBTIFF PREFIX ${ROOT_LIBTIFF_PREFIX} - URL ${lcgpackages}/tiff-${ROOT_LIBTIFF_VERSION}.tar.gz + URL https://root.cern/download/libtiff-${ROOT_LIBTIFF_VERSION}.tar.gz URL_HASH SHA256=${ROOT_LIBTIFF_HASH} CMAKE_ARGS -G ${CMAKE_GENERATOR} - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DCMAKE_POLICY_VERSION_MINIMUM=3.12 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX= -DCMAKE_INSTALL_LIBDIR=/lib @@ -68,17 +68,9 @@ ExternalProject_Add( -Dlibdeflate=OFF # if ON or unset, then you need to target link libs interface below -Dpixarlog=OFF -Dwebp=OFF - -DZLIB_LIBRARY=${ZLIB_LIBRARIES} - -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS} ${ZLIB_ROOT_OPTION} - -DZSTD_LIBRARY=${ZSTD_LIBRARIES} - -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIRS} ${ZSTD_ROOT_OPTION} - -DLIBLZMA_LIBRARY=${LZMA_LIBRARIES} - -DLIBLZMA_INCLUDE_DIR=${LZMA_INCLUDE_DIRS} ${LZMA_ROOT_OPTION} - -DJPEG_LIBRARY=${JPEG_LIBRARIES} - -DJPEG_INCLUDE_DIR=${JPEG_INCLUDE_DIRS} ${JPEG_ROOT_OPTION} BUILD_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBTIFF_BUILD_COMMAND_FLAGS} INSTALL_COMMAND ${CMAKE_COMMAND} --build . ${ROOT_LIBTIFF_BUILD_COMMAND_FLAGS} --target install