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

[HPX] Don't remove HPXCacheVariables.cmake during install #23042

Merged
merged 2 commits into from
Mar 11, 2022

Conversation

hkaiser
Copy link
Contributor

@hkaiser hkaiser commented Feb 11, 2022

Describe the pull request

  • What does your PR fix?

    Fixes project builds that depend on HPX installed using vcpkg

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

    all, Yes

  • 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

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/hpx/vcpkg.json

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

@LilyWangLL LilyWangLL added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Feb 11, 2022
@autoantwort
Copy link
Contributor

This file contains absolute paths. You must replace all absolute paths by relative ones.

@hkaiser
Copy link
Contributor Author

hkaiser commented Feb 11, 2022

This file contains absolute paths. You must replace all absolute paths by relative ones.

Could you be more specific please? What file? What paths? And how do you suggest replacing those? The only thing this PR does is to remove a line. Nothing else has changed.

@autoantwort
Copy link
Contributor

Could you be more specific please? What file?

HPXCacheVariables.cmake

And how do you suggest replacing those?

You can use vcpkg_replace_strings() to do that.

@BillyONeal
Copy link
Member

@hkaiser To clarify, we need to prevent absolute paths from making it in to the output, because when a cached package is restored on a different machine, all those paths are broken. Ideally, that file would be written to use paths relative to ${CMAKE_CURRENT_LIST_DIR} or something similar.

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 hpx but no changes to version or port version.
-- Version: 1.7.1#4
-- Old SHA: 815641d6119376c546119a841f6c035e8f27b8da
-- New SHA: 6441b19100ce57830f43b5a45c0cde2418c640ec
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
index 5736779..9eec62d 100644
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "6441b19100ce57830f43b5a45c0cde2418c640ec",
+      "git-tree": "815641d6119376c546119a841f6c035e8f27b8da",
       "version-semver": "1.7.1",
       "port-version": 4
     },

- make sure HPXCMakeVariables.cmake does not contain any directory names
@hkaiser
Copy link
Contributor Author

hkaiser commented Feb 22, 2022

@hkaiser To clarify, we need to prevent absolute paths from making it in to the output, because when a cached package is restored on a different machine, all those paths are broken. Ideally, that file would be written to use paths relative to ${CMAKE_CURRENT_LIST_DIR} or something similar.

@BillyONeal this has been resolved now. Thanks!

@hkaiser
Copy link
Contributor Author

hkaiser commented Mar 11, 2022

@BillyONeal will this be merged at some point?

@BillyONeal
Copy link
Member

@BillyONeal will this be merged at some point?

Sorry for the delay, I just poked the person "on call" for merging things to confirm they're OK with it.

@BillyONeal BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Mar 11, 2022
@vicroms vicroms merged commit af22873 into microsoft:master Mar 11, 2022
@hkaiser hkaiser deleted the hpx_install branch March 11, 2022 23:21
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Mar 14, 2022
* master: (64 commits)
  [baseline] [python3] fix bz2(d) search on linux (microsoft#23525)
  [HPX] Don't remove HPXCacheVariables.cmake during install (microsoft#23042)
  [earcut.hpp] New port (microsoft#23507)
  [libssh2] Fix deleted configfiles (microsoft#23509)
  [python3] Update to Python 3.10.2. (microsoft#23156)
  [qt5-webengine] Fix apply patch failed (microsoft#23484)
  [llvm] Fix LLVM install for 'utils' feature (microsoft#23399)
  [sciter-js] Updated sciter-js to 4.4.8.31 (microsoft#23357)
  [GTL] Add new port (microsoft#23400)
  [raylib] Fix cannot find -lglfw on Linux (microsoft#23348)
  [yato] fix arm build by updating (microsoft#23406)
  [ois] fix pkgconfig file not installed on windows (microsoft#23426)
  Fix the dependency of installing arrow with the parquet feature (microsoft#23423)
  [libjpeg-turbo] Fix usage when building static (microsoft#23427)
  [sentencepiece] Clarify supported triplets (microsoft#23438)
  [zpp-bits] Add new port (microsoft#23458)
  [lionkor-commandline] Add new port (microsoft#23471)
  [libde265] fix static linkage (microsoft#23479)
  [libheif] fix license (microsoft#23480)
  [proj4] Retain former features (fixes `vcpkg upgrade`) (microsoft#23487)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants