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

Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) #18132

Merged

Conversation

past-due
Copy link
Contributor

Permits appending / forwarding options to the configure command (in vcpkg_configure_make) from a triplet.

This should enable resolving a number of outstanding issues with various community (and custom) triplets, and avoid having to hard-code those fixes in vcpkg_configure_make.cmake itself.

Adds support for three new triplet variables:

  • VCPKG_MAKE_CONFIGURE_OPTIONS
  • VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE
  • VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG

Example:

Add to a triplet:

set(VCPKG_MAKE_CONFIGURE_OPTIONS "lt_cv_deplibs_check_method=pass_all")

To skip libtool checks that may errantly fail in a number of configurations / triplets.

@ras0219-msft @Neumann-A

To append options to the configure command
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

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

I'd like to see the same changes in ports/vcpkg_cmake/vcpkg_cmake_configure.cmake

@JackBoosY JackBoosY added category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly requires:author-response labels May 27, 2021
@dg0yt
Copy link
Contributor

dg0yt commented May 27, 2021

This needs to get documentation here and/or in docs/users/triplets.md. At least it needs a mention here similar to VCPKG_MAKE_BUILD_TRIPLET.

past-due and others added 3 commits May 27, 2021 09:34
Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>
Co-Authored-By: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
@past-due past-due requested a review from JackBoosY May 27, 2021 14:12
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

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

Please bump vcpkg-cmake version. See documentation.
Also please run command vcpkg x-add-version vcpkg-cmake then commit the changes.

@past-due
Copy link
Contributor Author

past-due commented May 28, 2021

Please bump vcpkg-cmake version. See documentation.
Also please run command vcpkg x-add-version vcpkg-cmake then commit the changes.

@JackBoosY Done. 👍

(I'm still getting used to some of those scripts being proper ports now. 😅)

@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels May 28, 2021
Copy link
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

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

needs fixin'

ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved
ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved
ports/vcpkg-cmake/vcpkg_cmake_configure.cmake Outdated Show resolved Hide resolved
@past-due
Copy link
Contributor Author

past-due commented Jun 7, 2021

The single failure in x86_windows appears to have nothing to do with this PR:

> -- Fetching git://code.qt.io/qt/qtnetworkauth.git...
> CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:105 (message):
>     Command failed: C:/agent/externals/git/cmd/git.exe fetch git://code.qt.io/qt/qtnetworkauth.git v6.1.0 --depth 1 -n
>     Working Directory: D:/downloads/git-tmp
>     Error code: 128
>     See logs for more information:
>       D:\buildtrees\qtnetworkauth\git-fetch-x86-windows-err.log

@strega-nil-ms strega-nil-ms merged commit 38d2893 into microsoft:master Jun 8, 2021
@strega-nil-ms
Copy link
Contributor

Thanks @past-due :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants