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

[osg] Fix debug targets for plugins in unofficial-osg #33782

Merged
merged 2 commits into from
Sep 18, 2023
Merged

[osg] Fix debug targets for plugins in unofficial-osg #33782

merged 2 commits into from
Sep 18, 2023

Conversation

cbrl
Copy link
Contributor

@cbrl cbrl commented Sep 14, 2023

This fixes the imported locations for the OSG plugin targets in unofficial-osg. Since these plugins are installed to the plugins/ folder, instead of bin/ or lib/, vcpkg_cmake_config_fixup will not add the debug folder prefix to the imported locations. This causes an error when running find_package(unofficial-osg COMPONENTS plugins).

To fix this issue, the relevant bit of vcpkg_cmake_config_fixup is copied into the portfile and modified to apply specifically to the plugin targets file. It's not exactly the cleanest method, but I don't think there's another way to do it that doesn't require manually patching paths outside of vcpkg_cmake_config_fixup.

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@FrankXie05 FrankXie05 added the category:port-bug The issue is with a library, which is something the port should already support label Sep 15, 2023
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Sep 15, 2023
@vicroms vicroms merged commit 01ed87c into microsoft:master Sep 18, 2023
@cbrl cbrl deleted the osg-plugins branch September 18, 2023 18:52
@gwaldron
Copy link
Contributor

This is causing a build failure when you only build release mode with a custom triplet containing:

set(VCPKG_BUILD_TYPE release)

The error message is:

- Building x64-windows-rel
CMake Error at ports/osg/portfile.cmake:139 (file):
  file failed to open for reading (No such file or directory):

    H:/vcpkg/packages/osg_x64-windows/share/unofficial-osg/osg-plugins-debug.cmake

@cbrl cbrl restored the osg-plugins branch September 19, 2023 22:58
@cbrl
Copy link
Contributor Author

cbrl commented Sep 19, 2023

Ah, right I didn't think about the release-only triplets. I'll add a conditional on the existence of that file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants