[openxr-loader] Fix package name and enable arm by bwrsandman · Pull Request #23928 · microsoft/vcpkg

bwrsandman · 2022-04-01T20:56:53Z

Describe the pull request

What does your PR fix?

Makes it easier to use openxr-loader and enabled arm

Previously it prints this with find_package(openxr-loader which is wrong and should have OpenXR.

[cmake] The package openxr-loader provides CMake targets:
[cmake] 
[cmake]     find_package(openxr-loader CONFIG REQUIRED)
[cmake]     target_link_libraries(main PRIVATE OpenXR::headers OpenXR::openxr_loader)

Now it prints:

[cmake] The package openxr-loader provides CMake targets:
[cmake] 
[cmake]     find_package(OpenXR CONFIG REQUIRED)
[cmake]     target_link_libraries(main PRIVATE OpenXR::headers OpenXR::openxr_loader)

Which triplets are supported/not supported? Have you updated the CI baseline?

I have removed the arm restriction after testing cross compiling to android and host compiling on linux arm

Does your PR follow the maintainer guide?

Yes

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

Details

If you feel able to do so, please consider adding a "license" field to the following files:

ports/openxr-loader/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 6fa767aca9474519b737f56fcf0a519023c8ee56 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json
index f56d149..e576bd8 100644
--- a/versions/o-/openxr-loader.json
+++ b/versions/o-/openxr-loader.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "29282b8e08976099dea0e7b8aab03077c0047afd",
+      "git-tree": "4f55db29b61060220d599e61470a0db5e53a595c",
       "version": "1.0.22",
       "port-version": 2
     },

JonLiu1993 · 2022-04-02T05:53:21Z

@bwrsandman ,Thanks for yur pr, I tested the usage on my local machine but failed, This is error log:

1> Command line: "C:\WINDOWS\system32\cmd.exe" /c "%SYSTEMROOT%\System32\chcp.com 65001 >NUL && "C:\PROGRAM FILES (X86)\MICROSOFT VISUAL STUDIO\2019\ENTERPRISE\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\CMake\bin\cmake.exe"  -G "Visual Studio 16 2019" -A Win32  -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DCMAKE_INSTALL_PREFIX:PATH="C:\Users\vzhli17\source\repos\test-lib\out\install\x86-Debug" -DCMAKE_TOOLCHAIN_FILE=F:/Feature-test/openxr/vcpkg/scripts/buildsystems/vcpkg.cmake "C:\Users\vzhli17\source\repos\test-lib" 2>&1"
1> Working directory: C:\Users\vzhli17\source\repos\test-lib\out\build\x86-Debug
1> [CMake] -- Selecting Windows SDK version 10.0.19041.0 to target Windows 10.0.19042.
1> [CMake] -- The C compiler identification is MSVC 19.29.30137.0
1> [CMake] -- The CXX compiler identification is MSVC 19.29.30137.0
1> [CMake] -- Detecting C compiler ABI info
1> [CMake] -- Detecting C compiler ABI info - done
1> [CMake] -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x86/cl.exe - skipped
1> [CMake] -- Detecting C compile features
1> [CMake] -- Detecting C compile features - done
1> [CMake] -- Detecting CXX compiler ABI info
1> [CMake] -- Detecting CXX compiler ABI info - done
1> [CMake] -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x86/cl.exe - skipped
1> [CMake] -- Detecting CXX compile features
1> [CMake] -- Detecting CXX compile features - done
1> [CMake] CMake Error at F:/Feature-test/openxr/vcpkg/scripts/buildsystems/vcpkg.cmake:816 (_find_package):
1> [CMake]   Could not find a package configuration file provided by "openxr_loader"
1> [CMake]   with any of the following names:
1> [CMake] 
1> [CMake]     openxr_loaderConfig.cmake
1> [CMake]     openxr_loader-config.cmake
1> [CMake] 
1> [CMake]   Add the installation prefix of "openxr_loader" to CMAKE_PREFIX_PATH or set
1> [CMake]   "openxr_loader_DIR" to a directory containing one of the above files.  If
1> [CMake]   "openxr_loader" provides a separate development package or SDK, be sure it
1> [CMake]   has been installed.

CMakeLists:

# CMakeList.txt : CMake project for test-lib, include source and define
# project specific logic here.
#
cmake_minimum_required (VERSION 3.8)

project(test)
# Add source to this project's executable.
add_executable (test-lib "test-lib.cpp" "test-lib.h")

# TODO: Add tests and install targets if needed.
find_package(openxr_loader CONFIG REQUIRED)

target_link_libraries(test-lib PRIVATE OpenXR::headers OpenXR::openxr_loader)

bwrsandman · 2022-04-02T11:46:12Z

I updated it after testing. The find package should be OpenXR. The PR should be updated

bwrsandman · 2022-04-02T13:06:41Z

Also, I don't see why arm is disallowed since Android ARM is one of the biggest usecases for OpenXR (oculus Quest)

dg0yt · 2022-04-04T04:14:15Z

The port installs share/openxr-loader/OpenXRConfig.cmake. The filename indicates that the proper package name is OpenXR (case-sensitive!) however the location is not right. It must match the package name (case-insensitive). The easiest fix is adding PACKAGE_NAME OpenXR to vcpkg_cmake_config_fixup.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json
index 9b867d9..6c65bc3 100644
--- a/ports/openxr-loader/vcpkg.json
+++ b/ports/openxr-loader/vcpkg.json
@@ -5,7 +5,7 @@
   "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices",
   "homepage": "https://github.com/KhronosGroup/OpenXR-SDK",
   "license": "Apache-2.0",
-  "supports": "android|!(arm | uwp)",
+  "supports": "android | !(arm | uwp)",
   "dependencies": [
     "jsoncpp",
     {

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout e79aaaaf3c1b157d29388951b5aa2672defc78b8 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json
index 87bca6b..8e59894 100644
--- a/versions/o-/openxr-loader.json
+++ b/versions/o-/openxr-loader.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9492018923238cff2976b1399f171817f80968a3",
+      "git-tree": "8d0ca56cad6ab2877b6d43ffe30dda20519d9091",
       "version": "1.0.22",
       "port-version": 2
     },

bwrsandman · 2022-04-05T22:14:40Z

@dg0yt I changed the package name with vcpkg_cmake_config_fixup as you recommended

I also went and enabled arm after testing cross compiling to android armeabi-v7a and testing a host build on ARM linux (raspberry pi).
Still haven't tested arm windows.

One thing of note is that on linux it requires host to have Xlib.h like sdl2[xlib]

bwrsandman · 2022-04-06T12:04:39Z

I am also pretty sure OpenXR supports uwp for hololens. I don't have the means to test it though

JonLiu1993 · 2022-04-07T09:39:48Z

I tested the usage successfully:

1> CMake generation started for configuration: 'x64-Debug'.
1> Command line: "C:\WINDOWS\system32\cmd.exe" /c "%SYSTEMROOT%\System32\chcp.com 65001 >NUL && 
...
...
1> [CMake] -- Selecting Windows SDK version 10.0.19041.0 to target Windows 10.0.19042.
1> [CMake] -- The C compiler identification is MSVC 19.29.30137.0
1> [CMake] -- The CXX compiler identification is MSVC 19.29.30137.0
1> [CMake] -- Detecting C compiler ABI info
1> [CMake] -- Detecting C compiler ABI info - done
1> [CMake] -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe - skipped
1> [CMake] -- Detecting C compile features
1> [CMake] -- Detecting C compile features - done
1> [CMake] -- Detecting CXX compiler ABI info
1> [CMake] -- Detecting CXX compiler ABI info - done
1> [CMake] -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe - skipped
1> [CMake] -- Detecting CXX compile features
1> [CMake] -- Detecting CXX compile features - done
1> [CMake] -- Looking for pthread.h
1> [CMake] -- Looking for pthread.h - not found
1> [CMake] -- Found Threads: TRUE  
1> [CMake] -- Configuring done
1> [CMake] -- Generating done
1> [CMake] -- Build files have been written to: C:/Users/test/source/repos/opex/out/build/x64-Debug
1> Extracted CMake variables.
1> Extracted source files and headers.
1> Extracted code model.
1> Extracted toolchain configurations.
1> Extracted includes paths.
1> CMake generation finished.

strega-nil-ms · 2022-04-07T16:47:53Z

Thanks!

bwrsandman force-pushed the openxr-loader-usage branch from 75b96a7 to 3452955 Compare April 1, 2022 22:36

github-actions bot approved these changes Apr 1, 2022

View reviewed changes

bwrsandman force-pushed the openxr-loader-usage branch from 3452955 to 8ed338d Compare April 1, 2022 22:41

bwrsandman marked this pull request as ready for review April 1, 2022 22:41

bwrsandman force-pushed the openxr-loader-usage branch from 8ed338d to 262beea Compare April 1, 2022 22:42

github-actions bot requested changes Apr 1, 2022

View reviewed changes

bwrsandman force-pushed the openxr-loader-usage branch from 262beea to 2c28e98 Compare April 1, 2022 22:45

github-actions bot approved these changes Apr 1, 2022

View reviewed changes

JonLiu1993 self-assigned this Apr 2, 2022

JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 2, 2022

bwrsandman force-pushed the openxr-loader-usage branch from 2c28e98 to c13905a Compare April 2, 2022 03:32

github-actions bot approved these changes Apr 2, 2022

View reviewed changes

JonLiu1993 added the requires:author-response label Apr 2, 2022

dg0yt mentioned this pull request Apr 4, 2022

[vcpkg-tool] vcpkg install <pkg> gives wrong usage information #20190

Closed

bwrsandman force-pushed the openxr-loader-usage branch from c13905a to 4112250 Compare April 5, 2022 21:57

github-actions bot requested changes Apr 5, 2022

View reviewed changes

[openxr-loader] Fix package name and enable arm

4af53ef

bwrsandman force-pushed the openxr-loader-usage branch from 4112250 to 4af53ef Compare April 5, 2022 22:11

bwrsandman changed the title ~~[openxr-loader] add usage that has correct spelling for find package~~ [openxr-loader] Fix package name and enable arm Apr 5, 2022

github-actions bot approved these changes Apr 5, 2022

View reviewed changes

JonLiu1993 removed the requires:author-response label Apr 6, 2022

JonLiu1993 approved these changes Apr 7, 2022

View reviewed changes

JonLiu1993 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 7, 2022

strega-nil-ms merged commit 2f45391 into microsoft:master Apr 7, 2022

bwrsandman deleted the openxr-loader-usage branch April 7, 2022 17:24

Thomas1664 mentioned this pull request Apr 9, 2022

[openxr-loader] remove from CI baseline #24057

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[openxr-loader] Fix package name and enable arm#23928

[openxr-loader] Fix package name and enable arm#23928
strega-nil-ms merged 1 commit intomicrosoft:masterfrom
bwrsandman:openxr-loader-usage

bwrsandman commented Apr 1, 2022 •

edited

Loading

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

JonLiu1993 commented Apr 2, 2022

Uh oh!

bwrsandman commented Apr 2, 2022

Uh oh!

bwrsandman commented Apr 2, 2022

Uh oh!

dg0yt commented Apr 4, 2022

Uh oh!

github-actions bot left a comment

Uh oh!

bwrsandman commented Apr 5, 2022

Uh oh!

bwrsandman commented Apr 6, 2022

Uh oh!

JonLiu1993 commented Apr 7, 2022

Uh oh!

strega-nil-ms commented Apr 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

bwrsandman commented Apr 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

JonLiu1993 commented Apr 2, 2022

Uh oh!

bwrsandman commented Apr 2, 2022

Uh oh!

bwrsandman commented Apr 2, 2022

Uh oh!

dg0yt commented Apr 4, 2022

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

bwrsandman commented Apr 5, 2022

Uh oh!

bwrsandman commented Apr 6, 2022

Uh oh!

JonLiu1993 commented Apr 7, 2022

Uh oh!

strega-nil-ms commented Apr 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bwrsandman commented Apr 1, 2022 •

edited

Loading

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?