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|cmake buildsystem] synchronize and sanitize scripts. #23259

Merged
merged 50 commits into from
May 6, 2022

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Feb 24, 2022

push vcpkg_cmake_ stuff to be more up to date to vcpkg_x_cmake stuff.

  • add triplet variable VCPKG_CMAKE_GENERATOR for people who are brave enough to do that.

closes #23248 ?
depends #23846

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 category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly category:scripts-audit Part of the scripts audit effort. labels Feb 25, 2022
@Neumann-A Neumann-A marked this pull request as ready for review April 23, 2022 09:02
@Neumann-A
Copy link
Contributor Author

@JackBoosY Please remove tag requires:author-response. CI is green.

@JackBoosY JackBoosY added requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. and removed requires:author-response labels Apr 26, 2022
Alexander Neumann added 3 commits May 5, 2022 09:51
…ection

# Conflicts:
#	ports/vcpkg-cmake/vcpkg.json
#	versions/baseline.json
#	versions/v-/vcpkg-cmake.json
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 4b766c1cd17205e1b768c4fadfd5f867c1d0510e -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index f31c7a90..3f0c7d21 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -174,7 +174,7 @@
     },
     "ashes": {
       "baseline": "2022-04-03",
-      "port-version": 0
+      "port-version": 1
     },
     "asio": {
       "baseline": "1.22.1",

ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Show resolved Hide resolved
scripts/cmake/vcpkg_build_cmake.cmake Outdated Show resolved Hide resolved
string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug\"")
string(APPEND parallel_configure_contents "${line}\n\n")
if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug")
z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg")
Copy link
Contributor

Choose a reason for hiding this comment

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

This is in scripts/cmake/vcpkg_configure_cmake, I think we'd better to make a copy instead of calling it here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

scripts won't go away due to versioning so that function will always exist.

@JackBoosY JackBoosY added requires:author-response and removed requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels May 5, 2022
@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels May 6, 2022
@JackBoosY
Copy link
Contributor

Will rerun the failed tests.

@BillyONeal
Copy link
Member

Thanks for the improvements!

I explicitly checked that there are only additions and things that shouldn't be backcompat issues in the scripts/ ones.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:scripts-audit Part of the scripts audit effort. category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Differences between vcpkg_configure_cmake and vcpkg_cmake_configure
5 participants