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.

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

[Spirv reflect] Add new port #22295

Merged
merged 29 commits into from
Feb 11, 2022
Merged

Conversation

kleszcz
Copy link
Contributor

@kleszcz kleszcz commented Jan 2, 2022

Describe the pull request

  • What does your PR fix?

    Adds port for SPIRV-Reflect

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

    linux, windows, No

  • 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/

@ghost
Copy link

ghost commented Jan 2, 2022

CLA assistant check
All CLA requirements met.

@kleszcz kleszcz marked this pull request as ready for review January 2, 2022 17:37
@JonLiu1993 JonLiu1993 self-assigned this Jan 4, 2022
@JonLiu1993 JonLiu1993 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Jan 4, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/spirv-reflect/portfile.cmake

@JonLiu1993 JonLiu1993 changed the title Spirv reflect port [Spirv reflect] Add new port Jan 4, 2022
ports/spirv-reflect/portfile.cmake Outdated Show resolved Hide resolved
ports/spirv-reflect/vcpkg.json Outdated Show resolved Hide resolved
versions/s-/spirv-reflect.json Outdated Show resolved Hide resolved
kleszcz and others added 2 commits January 4, 2022 07:50
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/spirv-reflect/portfile.cmake

@JonLiu1993
Copy link
Member

@kleszcz ,Have you tested the usage locally?

@kleszcz
Copy link
Contributor Author

kleszcz commented Jan 4, 2022

Hi @JonLiu1993!
Yes, I've it tested locally. Also I use this port in my Vulkan project via vcpkg manifest and it works fine .

@JonLiu1993
Copy link
Member

@strega-nil-ms ,Could you please take a look?

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Jan 14, 2022
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are mostly just nitpicks, thanks for the port!

ports/spirv-reflect/CMakeLists.txt Outdated Show resolved Hide resolved
Comment on lines 17 to 21
if(DEFINED ENV{VULKAN_SDK})
message(STATUS "VULKAN_SDK env var found: $ENV{VULKAN_SDK}")
else()
message(FATAL_ERROR "VULKAN_SDK env var not found!")
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be duplicating output from the dependency vulcan port so I don't know how useful this reporting is; I would remove it. If it stays, I think you need to explain something about how the user can remedy the situation.

)

install(
EXPORT spirv-reflect-config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When vcpkg makes up these names we usually try to add unofficial- as a prefix so that we don't stomp on upstream should they choose to add their own CMake targets. Or is this intended to match upstream exactly? (I see in the history this PR used to not be a complete build replacement)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the EXPORT be named unofficial-spriv-reflect-config and should I rename the namespace too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the "config" name doesn't need the prefix because we can compose that if upstream ever adds official support. (That is, the foo-config can provide both foo and unofficial-foo targets to not break existing customers if we want)

ports/spirv-reflect/CMakeLists.txt Outdated Show resolved Hide resolved
@BillyONeal BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Jan 15, 2022
@JonLiu1993
Copy link
Member

@kleszcz ,Could you please consider @BillyONeal 's suggestion?

kleszcz and others added 3 commits February 1, 2022 17:18
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for spirv-reflect but no changes to version or port version.
-- Version: 2021-12-31
-- Old SHA: ae1fa5320c5da60247371bad1cd79fa87fea274d
-- New SHA: 63be5702e26e0065c5e067d100b1a26a5240c249
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/spirv-reflect/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

kleszcz and others added 3 commits February 10, 2022 22:23
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

  • ports/spirv-reflect/vcpkg.json

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

@BillyONeal
Copy link
Member

@strega-nil tells me my reply above was incorrect. In order to reduce confusion I've submitted #23041 to codify what we want. I will push a change consistent with what lands there here if you want me to.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for spirv-reflect but no changes to version or port version.
-- Version: 2021-12-31
-- Old SHA: 78347a377022009b403554dfcb56b8d6c19182b9
-- New SHA: bcebcfdd9e9332b68c4185b3127fc898fc91402a
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

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

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

  • ports/spirv-reflect/vcpkg.json

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

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

  • ports/spirv-reflect/vcpkg.json

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

@BillyONeal BillyONeal merged commit 7003b95 into microsoft:master Feb 11, 2022
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 15, 2022
* master: (54 commits)
  [imgui] Update to 1.87 [implot] Update to 0.13 (microsoft#22988)
  [nu-book-zxing-cpp] New port  (microsoft#22657)
  [librabbitmq] Update to 0.11.0 (microsoft#23037)
  [doc] Add doc for `supports` expression `staticcrt` (microsoft#23079)
  [doctest] Update to 2.4.8 (microsoft#23081)
  [log4cplus] Remove unneeded catch dependency (microsoft#23066)
  [Azure SDK] Update vcpkg ports for Feb Release (microsoft#23080)
  [Freerdp] Update to 2.5.0 (microsoft#23095)
  Update vcpkg-tool to 2022-02-11 (microsoft#23059)
  Minor bugfixes to MacOS deployment readme. (microsoft#23062)
  [ci.baseline.txt] Skip colmap on osx due to metis conflict (microsoft#23047)
  [gtkmm] update to 4.6.0 (microsoft#23024)
  [faiss] Update to 1.7.2 (microsoft#22705)
  [ocilib] Disable warning C4191 (microsoft#23028)
  [polyhook2] Update to latest  (microsoft#23044)
  Add notice about how to export unofficial CMake targets. (microsoft#23041)
  [Spirv reflect] Add new port (microsoft#22295)
  [easyhook] Update target .NET Framework version to 4.7.2. (microsoft#23040)
  [gh suggestions] change license link, make it details (microsoft#22946)
  [field3d] Remove port (microsoft#22463)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants