-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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_find_acquire_program] Enable find_acquire(PKGCONFIG) #12626
[vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) #12626
Conversation
…config from failing the package build.
Reduce default verbosity of vcpkg_fixup_pkgconfig
Can MS not open a repo called vcpkg-buildtools or similiar which hosts all the tools on github? Pkg-config can easily be built by vcpkg. See #11523 |
…program.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
pkg-config
|
@Neumann-A
|
Thanks for the link @voskrese! Based on my testing, the mingw32 copy of pkg-config only requires one additional dep (libwinpthread). This should give us the best of both worlds: up-to-date pkg-config as well as freedom from If this works, I believe this is a technique we can apply across the ecosystem to remove dependence on msys pacman. |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
…roschuma/pkgconfig2
The lapack errors are unrelated; in CI:
when trying to repro locally, vcpkg selected ninja from my VS instance:
lapack-reference failures are the causes of |
…roschuma/pkgconfig2
…roschuma/pkgconfig2
@@ -2,7 +2,7 @@ set(GEOGRAM_VERSION 1.7.5) | |||
|
|||
vcpkg_download_distfile(ARCHIVE | |||
URLS "https://gforge.inria.fr/frs/download.php/file/38314/geogram_${GEOGRAM_VERSION}.tar.gz" | |||
FILENAME "geogram_${GEOGRAM_VERSION}.tar.gz" | |||
FILENAME "geogram_${GEOGRAM_VERSION}_47dcbb8.tar.gz" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On one of the CI machines, there was a extant geogram_${GEOGRAM_VERSION}.tar.gz
file with the previous version's hash.
Renaming the file resolved the conflict.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see; it just looks odd to have that variable GEOGRAM_VERSION
but this be a hardcoded constant. Not necessarily worth resetting CI over but it's confusing nonetheless
set(PKGCONFIG $ENV{PKG_CONFIG} PARENT_SCOPE) | ||
return() | ||
elseif(CMAKE_HOST_WIN32) | ||
set(PROG_PATH_SUBDIR "${DOWNLOADS}/tools/${PROGNAME}/0.29.2-1") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems very strange to have ${PROGNAME}
but then a specific hardcoded version string?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point. I can change it, but that would invoke a total rebuild of the tree.
Thanks for your contribution! |
…ft#12626) Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
This PR enables
vcpkg_find_acquire_program(PKGCONFIG)
so we do not need to rely on msys2 for this common component.This uses a Win32-native build of
pkg-config
, which handles Win32 paths without cygwin/msys conversion and uses semicolon-delimited lists in path variables.