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

[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 #19088

Merged
merged 12 commits into from
Sep 14, 2021

Conversation

PhoebeHui
Copy link
Contributor

@PhoebeHui PhoebeHui commented Jul 23, 2021

Related to #18987

Support VS2022, change the order to select the cmake generator.

@PhoebeHui PhoebeHui added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team. labels Jul 23, 2021
@PhoebeHui PhoebeHui self-assigned this Jul 23, 2021
@PhoebeHui PhoebeHui changed the title [vcpkg] Support VS2022 17.0 [vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 Jul 23, 2021
@Neumann-A
Copy link
Contributor

doesn't this also require a change to vcpkg.cmake ?

@PhoebeHui
Copy link
Contributor Author

PhoebeHui commented Jul 28, 2021

The pistache issue would be fixed by #19206

@PhoebeHui PhoebeHui marked this pull request as ready for review July 29, 2021 02:37
@PhoebeHui PhoebeHui assigned JackBoosY and unassigned PhoebeHui Jul 29, 2021
@JackBoosY JackBoosY added the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Jul 29, 2021
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 vcpkg-cmake but no changes to version or port version.
-- Version: 2021-07-30
-- Old SHA: c6df7e0faeda9e783175746c7c440c9bc2bdb111
-- New SHA: 0542cefb59997978bc64b94968d3938c2f6665ec
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 63aa65e65b9d2c08772ea15d25fb8fdb0d32e557 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
index 26659d1..276f18a 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "0542cefb59997978bc64b94968d3938c2f6665ec",
+      "git-tree": "6b7d32d2b71c5165213ec0f4cd5b691da00d11b7",
       "version-date": "2021-07-30",
       "port-version": 1
     },

@PhoebeHui
Copy link
Contributor Author

PhoebeHui commented Aug 13, 2021

qt5-tools[core]:x86-windows failed in CI testing, it looks a baseline issue.

Installing package qt5-tools[core]:x86-windows...
The following files are already installed in D:/installed/x86-windows and are in conflict with qt5-tools:x86-windows

Installed by qt5-declarative:x86-windows
    tools/qt5/bin/qml/QtQuick/XmlListModel/qmlxmllistmodelplugin.dll

@Neumann-A, do you know more about the failures? I tried to repro this issue locally, however, both qt5-tools and qt5-declarative don't have tools/qt5/bin/qml/QtQuick/XmlListModel/qmlxmllistmodelplugin.dll.
qt5-tools depends on qt5-declarative.

@PhoebeHui PhoebeHui requested a review from BillyONeal September 9, 2021 08:49
ports/vcpkg-cmake/vcpkg.json Outdated Show resolved Hide resolved
ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved
@PhoebeHui PhoebeHui removed the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Sep 14, 2021
@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Sep 14, 2021
@BillyONeal BillyONeal merged commit c592209 into microsoft:master Sep 14, 2021
@BillyONeal
Copy link
Member

Thanks for the fix!

@PhoebeHui PhoebeHui deleted the dev/Phoebe/vs2022 branch September 15, 2021 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants