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.

Sign up for GitHub

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

Jump to bottom

[vcpkg] Refactor toolchain & generator selection #23846

Merged
merged 21 commits into from
Apr 11, 2022
Merged

[vcpkg] Refactor toolchain & generator selection #23846

merged 21 commits into from
Apr 11, 2022

Conversation

Neumann-A
Copy link
Contributor

picked from #23259

@Neumann-A Neumann-A mentioned this pull request Mar 29, 2022
Merged
github-actions[bot]
github-actions bot approved these changes Mar 29, 2022
View reviewed changes
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/vcpkg-cmake/vcpkg.json

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

restore PREFER_NINJA behavior on windows
4d6c67b 
use elseif instead of else
github-actions[bot]
github-actions bot approved these changes Mar 29, 2022
View reviewed changes
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/vcpkg-cmake/vcpkg.json

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

@JackBoosY JackBoosY added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Mar 30, 2022
github-actions[bot]
github-actions bot approved these changes Mar 30, 2022
View reviewed changes
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/vcpkg-cmake/vcpkg.json

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

@Neumann-A
Copy link
Contributor Author

bento4:arm-uwp regressions:
30>CUSTOMBUILD : CMake error : Cannot restore timestamp "D:/buildtrees/bento4/arm-uwp-dbg/CMakeFiles/generate.stamp": Access is denied. [D:\buildtrees\bento4\arm-uwp-dbg\mp4dump.vcxproj]
Maybe a simple retry fixes it.

@dg0yt
Copy link
Contributor

dg0yt commented Mar 30, 2022

bento4:arm-uwp regressions: 30>CUSTOMBUILD : CMake error : Cannot restore timestamp "D:/buildtrees/bento4/arm-uwp-dbg/CMakeFiles/generate.stamp": Access is denied. [D:\buildtrees\bento4\arm-uwp-dbg\mp4dump.vcxproj] Maybe a simple retry fixes it.

I had a similar issue with nanoflann: #21507 (comment)
I found that CMake has undocumented options for retries and waiting, but I don't have the reference now. (It is in Kitware's tickets, related to network file systems.)

@Neumann-A Neumann-A mentioned this pull request Mar 30, 2022
Merged
@JackBoosY
Copy link
Contributor

I'd like @strega-nil-ms review this PR again.

strega-nil
strega-nil suggested changes Apr 4, 2022
View reviewed changes
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

Those two changes then I'm an approve

scripts/cmake/vcpkg_configure_cmake.cmake Show resolved Hide resolved
scripts/cmake/vcpkg_configure_cmake.cmake Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

baseline issues.

@JackBoosY
Copy link
Contributor

Depends on #23999 and #23945.

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 6, 2022
Alexander Neumann added 3 commits April 7, 2022 15:43
Merge remote-tracking branch 'upstream/master' into select_default_ge…
dd14c4c 
…nerator

# Conflicts:
#	ports/vcpkg-cmake/vcpkg.json
#	versions/baseline.json
#	versions/v-/vcpkg-cmake.json
bump version
8cb5e82
version stuff
6d4bb79
@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 8, 2022
@JackBoosY JackBoosY mentioned this pull request Apr 8, 2022
Merged
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Apr 11, 2022
@strega-nil-ms
Copy link
Contributor

Thanks @Neumann-A !

@strega-nil-ms strega-nil-ms merged commit c556911 into microsoft:master Apr 11, 2022
Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Apr 11, 2022
@Jimmy-Hu
Merge pull request #983 from microsoft/master
a7fd009 
[vcpkg] Refactor toolchain & generator selection (microsoft#23846)
@Neumann-A Neumann-A deleted the select_default_generator branch April 12, 2022 06:33
This was referenced Apr 12, 2022
Merged
Closed
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Apr 12, 2022
@ekilmer
Merge branch 'master' into more-lief
27ec728 
* master: (139 commits)
  [dstorage] Add port for Microsoft.Direct3D.DirectStorage NuGet (microsoft#24063)
  [vcpkg] Refactor toolchain & generator selection (microsoft#23846)
  [icu] update to 70.1 (microsoft#23445)
  [vcpkg] Update android usage documentation (microsoft#23690)
  [LMDB] update to 0.9.29 (microsoft#24045)
  [catch2] Don't install docs (microsoft#24046)
  [harfbuff] fix arm64 osx build (microsoft#24055)
  [openxr-loader] remove from CI baseline (microsoft#24057)
  [imath] Update to 3.1.5 (microsoft#24059)
  [openssl] Fix dynamic builds on UNIX (microsoft#24061)
  [c-ares] update to 1.18.1 (microsoft#24062)
  [igraph] update to 0.9.8 (microsoft#24065)
  [cmake-user] Fix library check (microsoft#24070)
  [openxr-loader] fix ci.baseline.txt (microsoft#24073)
  [tinycbor] Fix file conflicts with libcbor (microsoft#24056)
  [graphviz,libslirp] Limit msys to windows (microsoft#24032)
  [bdwgc] Don't build docs (microsoft#24025)
  [capstone] update to 5.0.0-rc2 (microsoft#23979)
  [clockutils] Fix x64-windows-static-md (microsoft#23965)
  [braft] New port (microsoft#23830)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Thomas1664 Thomas1664 Thomas1664 left review comments

@dg0yt dg0yt dg0yt left review comments

@strega-nil strega-nil strega-nil requested changes

@strega-nil-ms strega-nil-ms strega-nil-ms approved these changes

@JackBoosY JackBoosY JackBoosY approved these changes

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

@JackBoosY JackBoosY

Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Neumann-A @dg0yt @JackBoosY @strega-nil-ms @strega-nil @Thomas1664