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

Header-only devel package PROVIDES field fixes #170

Merged
merged 6 commits into from
Aug 29, 2024

Conversation

lawruble13
Copy link
Collaborator

  • In the previous version, CPACK_DEBIAN_PACKAGE_PROVIDES was not evaluated, causing packages to include the literal string CPACK_DEBIAN_PACKAGE_PROVIDES in their provides field.
  • Changed the behaviour to more closely match that of CMake, using CPACK_<GEN>_PACKAGE_PROVIDES only if a component-specific variable is not set.
    • The provides field for the base package name without -dev[el] is added in either case.
  • The Debian and RPM provides are correctly split up to match CMake's behaviour.

Previously the code for provides field was not evaluating the CPACK_DEBIAN_PACKAGE_PROVIDES variable, causing CPACK_DEBIAN_PACKAGE_PROVIDES to be included as a literal string provided by the devel package.
@lawruble13 lawruble13 enabled auto-merge (squash) August 29, 2024 21:50
@lawruble13 lawruble13 merged commit d27d809 into ROCm:develop Aug 29, 2024
9 checks passed
@lawruble13 lawruble13 deleted the devel-provides-fix branch August 29, 2024 21:55
lawruble13 added a commit to lawruble13/rocm-cmake that referenced this pull request Sep 6, 2024
* Fix provides field

Previously the code for provides field was not evaluating the CPACK_DEBIAN_PACKAGE_PROVIDES variable, causing CPACK_DEBIAN_PACKAGE_PROVIDES to be included as a literal string provided by the devel package.

* Correct debian/rpm

* Fix misplaced comma

* Remove version from RPM provides field

---------

Co-authored-by: Eiden Yoshida <47196116+eidenyoshida@users.noreply.github.com>
lawruble13 added a commit to lawruble13/rocm-cmake that referenced this pull request Sep 6, 2024
* Fix provides field

Previously the code for provides field was not evaluating the CPACK_DEBIAN_PACKAGE_PROVIDES variable, causing CPACK_DEBIAN_PACKAGE_PROVIDES to be included as a literal string provided by the devel package.

* Correct debian/rpm

* Fix misplaced comma

* Remove version from RPM provides field

---------

Co-authored-by: Eiden Yoshida <47196116+eidenyoshida@users.noreply.github.com>
(cherry picked from commit d27d809)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants