From 593d52744d3a004e40b719fe7bc709c481c7719b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 9 Mar 2022 07:08:42 +0100 Subject: [PATCH 1/4] Use interface library for LZMA::LZMA --- ports/vtk/FindLZMA.patch | 5 +++-- ports/vtk/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/vtk/FindLZMA.patch b/ports/vtk/FindLZMA.patch index aacafcb367276d..990f2b2ae5ccc9 100644 --- a/ports/vtk/FindLZMA.patch +++ b/ports/vtk/FindLZMA.patch @@ -2,12 +2,13 @@ diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake index 0c8c794..796558c 100644 --- a/CMake/FindLZMA.cmake +++ b/CMake/FindLZMA.cmake -@@ -1,3 +1,10 @@ +@@ -1,3 +1,11 @@ +find_package(LibLZMA) +set(LZMA_INCLUDE_DIR "${LIBLZMA_INCLUDE_DIR}" CACHE INTERNAL "") +set(LZMA_LIBRARY "${LIBLZMA_LIBRARIES}" CACHE INTERNAL "") +if(NOT TARGET LZMA::LZMA) -+ add_library(LZMA::LZMA ALIAS LibLZMA::LibLZMA) ++ add_library(LZMA::LZMA INTERFACE IMPORTED) ++ target_link_libraries(LZMA::LZMA INTERFACE LibLZMA::LibLZMA) +endif() + find_path(LZMA_INCLUDE_DIR diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index edc48ba75db0af..a021fcfae1ccfe 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 8, + "port-version": 9, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", From 66ed1943f01c279e7c846c9c9ed4f3057d6249ad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 9 Mar 2022 07:09:03 +0100 Subject: [PATCH 2/4] Update versions --- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1dc849c472c753..3dd2ab8ecdfcad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7286,7 +7286,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 8 + "port-version": 9 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 994e3899bd57c7..533c125af0e94d 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e5e3c7054f7997aed7915f43f4f1534efa6995f", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 9 + }, { "git-tree": "585d1bca8e71d950c6d12ceb6ad720825ecbd704", "version-semver": "9.0.3-pv5.9.1", From 122781b363740affff797e419be4a8ca2a3b3ad8 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 11 Mar 2022 15:13:50 -0800 Subject: [PATCH 3/4] [vtk] bump port version --- ports/vtk/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 426ffdd13537b1..fb5a115dc61b69 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 9, + "port-version": 10, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", From 2d4be33269bf725d1b64124931f495b4bc9b73bd Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 11 Mar 2022 15:14:36 -0800 Subject: [PATCH 4/4] [vtk] Update version files --- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 0bd88f0e03e2ba..74d95834cdd0b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7298,7 +7298,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 9 + "port-version": 10 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index d1def2d959d199..d7362563531e1c 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 10 + }, { "git-tree": "3fa106f1a3c80a3ad15d8db406067c5253decc8e", "version-semver": "9.0.3-pv5.9.1",