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

[qttools] copy traget tools only if they exists. #30442

Merged
merged 1 commit into from
May 9, 2023

Conversation

daschuer
Copy link
Contributor

They do not exist if you crosscompile qt.

This fixes the build error that happens here when using an arm64-osx triplet on an x64-osx host:
https://github.com/daschuer/vcpkg/actions/runs/4476393103/jobs/7866710248

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

Comment on lines 95 to 99
set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app)
set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app)
if (FEATURE_qdbus)
message(STATUS "Built qdbusviewer")
list(APPEND OSX_APP_FOLDERS qdbusviewer.app)
endif()
Copy link
Contributor

Choose a reason for hiding this comment

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

qdbusviewer is already added, subject to a condition.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

ports/qttools/portfile.cmake Show resolved Hide resolved
@FrankXie05 FrankXie05 added the category:port-bug The issue is with a library, which is something the port should already support label Mar 27, 2023
They do not exist if you crosscompile qt
@FrankXie05
Copy link
Contributor

Note: I will be converting your PR to draft status. When you respond, please revert to "ready for review".
That way, I can be aware that you've responded since you can't modify the tags.

@FrankXie05 FrankXie05 marked this pull request as draft May 8, 2023 07:05
@daschuer daschuer marked this pull request as ready for review May 8, 2023 08:22
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label May 9, 2023
@vicroms vicroms merged commit e1cdda7 into microsoft:master May 9, 2023
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.

5 participants