Skip to content
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

Jump to bottom

[slicer-5.6-v9.2.20230607-1ff325c54-2] Backport support for using OpenXRConfig.cmake file provided by OpenXR-SDK #52

Merged
merged 2 commits into from
Jan 10, 2024
Merged

[slicer-5.6-v9.2.20230607-1ff325c54-2] Backport support for using OpenXRConfig.cmake file provided by OpenXR-SDK #52

merged 2 commits into from
Jan 10, 2024

Conversation

jcfr
Copy link
Member

@jcfr jcfr commented Jan 10, 2024

These changes correspond to the ones integrated in branch slicer-v9.2.20230607-1ff325c54-2 through #51

bourdaisj and others added 2 commits January 10, 2024 00:10
@bourdaisj @jcfr
[Backport] improve FindOpenXR.cmake for windows platform
7b53a01 
Merge-request: vtk/vtk!10487
(cherry picked from commit 68439dc)
(cherry picked from commit 667b9bc)
@sankhesh @jcfr
[Backport MR-10792] OpenXR: Use the OpenXRConfig.cmake files provided…
9ed4c54 
… by OpenXR-SDK

VTK now links directly to the OpenXR library targets provided by the
upstream openxr cmake package without needing a custom FindOpenXR.cmake
file.

Merge-request: vtk/vtk!10792
(cherry picked from commit 211f2b7)
@jcfr jcfr mentioned this pull request Jan 10, 2024
Merged
@jcfr jcfr merged commit cf35a03 into Slicer:slicer-5.6-v9.2.20230607-1ff325c54-2 Jan 10, 2024
@jcfr jcfr deleted the slicer-5.6-v9.2.20230607-1ff325c54-2_backport-openxr-config branch January 10, 2024 05:36
@jcfr
Copy link
Member Author

jcfr commented Jan 10, 2024 •
edited

Corresponding changes have been fetched in the VTK checkout found in the Stable release build tree on

  • metroplex (Linux)
  • computron (macOS)
  • overload (Windows).

For example, here is the output of the git pull on computron

$ git pull origin slicer-5.6-v9.2.20230607-1ff325c54-2 
[...]
From https://github.com/slicer/VTK
 * branch                  slicer-5.6-v9.2.20230607-1ff325c54-2 -> FETCH_HEAD
   eef17b2698..cf35a0326e  slicer-5.6-v9.2.20230607-1ff325c54-2 -> origin/slicer-5.6-v9.2.20230607-1ff325c54-2
Updating eef17b2698..cf35a0326e
Fast-forward
 CMake/FindOpenXR.cmake               | 64 ----------------------------------------------------------------
 CMake/vtkInstallCMakePackage.cmake   |  1 -
 Rendering/OpenXR/CMakeLists.txt      |  3 ++-
 Rendering/OpenXR/vtkOpenXR.h         |  2 +-
 Rendering/OpenXR/vtkOpenXRPlatform.h |  4 ++--
 5 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 CMake/FindOpenXR.cmake

@jcfr jcfr mentioned this pull request Apr 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
3 participants
@jcfr @bourdaisj @sankhesh