Skip to content

[vtk] Fix lzma patch #23444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 5 commits into from
Mar 15, 2022
Merged

[vtk] Fix lzma patch #23444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
593d527
Use interface library for LZMA::LZMA
dg0yt Mar 9, 2022
66ed194
Update versions
dg0yt Mar 9, 2022
bb919d4
Merge branch 'master' of github.com:microsoft/vcpkg into vtk-lzma
vicroms Mar 11, 2022
122781b
[vtk] bump port version
vicroms Mar 11, 2022
2d4be33
[vtk] Update version files
vicroms Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ports/vtk/FindLZMA.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/vtk/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7298,7 +7298,7 @@
},
"vtk": {
"baseline": "9.0.3-pv5.9.1",
"port-version": 9
"port-version": 10
},
"vtk-dicom": {
"baseline": "0.8.12",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vtk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down