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

[vcpkg] Don't override pkg-config prefix #17205

Merged
merged 2 commits into from
Jun 3, 2021
+1 −1
Merged

[vcpkg] Don't override pkg-config prefix #17205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677d584
Don't override pkg-config prefix
dg0yt Apr 10, 2021
da949f9
Rebuild
dg0yt May 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_configure_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ function(vcpkg_configure_make)
set(_LINK_CONFIG_BACKUP "$ENV{_LINK_}")
set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}")
endif()
set(ENV{PKG_CONFIG} "${PKGCONFIG} --define-variable=prefix=${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, this was setting an environment variable. With this removed, pkg-config is taken from PATH, and this may lead to the MSYS version which doesn't understand the Windows path separator :.

set(ENV{PKG_CONFIG} "${PKGCONFIG}")

set(_lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH)
foreach(_lib_env_var IN LISTS _lib_env_vars)
Expand Down