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

Jump to bottom

[vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries #13126

Merged
merged 42 commits into from
Dec 8, 2020
Merged

[vcpkg_fixup_pkgconfig] Handle spaces in path, do not validate individual libraries #13126

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7df1169
[vcpkg_fixup_pkgconfig] Large simplification, handle spaces in path.
ras0219 Aug 25, 2020
e1aee7b
[vcpkg] Update spaces end-to-end test to also use capitals
ras0219 Aug 25, 2020
ce6564d
[vcpkg_fixup_pkgconfig] Improve error messages and add filesystem sle…
ras0219 Aug 25, 2020
c1fa27b
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Aug 25, 2020
248359c
Merge remote-tracking branch 'origin/master' into dev/roschuma/pkgcon…
ras0219-msft Aug 26, 2020
2fb5b89
[nettle] Fix pkgconfig generation on Windows
ras0219-msft Aug 26, 2020
4db7f46
[gmp] Handle change in install_msbuild
ras0219-msft Aug 26, 2020
3bd3905
[vcpkg_fixup_pkgconfig] Handle spaces on non-Windows platforms
ras0219-msft Aug 26, 2020
cb56eda
[vcpkg_fixup_pkgconfig] Handle issue with win32 pkg-config double esc…
ras0219 Aug 27, 2020
0d6bfe4
Merge remote-tracking branch 'origin/master' into dev/roschuma/pkgcon…
BillyONeal Aug 27, 2020
ce7a48a
[vcpkg_fixup_pkgconfig] Ignore implicit libraries in .pc file (stdc++…
ras0219 Aug 28, 2020
250503c
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Aug 28, 2020
ba9df3c
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Sep 1, 2020
5891d70
[vcpkg_fixup_pkgconfig] Handle + and - in library names
ras0219-msft Sep 1, 2020
6cc5956
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Sep 1, 2020
edc8e6e
[vcpkg_fixup_pkgconfig] Process libname only for use in variables, no…
ras0219-msft Sep 1, 2020
41efa6f
[vcpkg_fixup_pkgconfig] Revert libname processing
ras0219-msft Sep 1, 2020
c60d880
[vcpkg_fixup_pkgconfig] Substitute {exec_prefix}/debug/ to just {exec…
ras0219-msft Sep 3, 2020
409e45c
[vcpkg_fixup_pkgconfig] Handle exec_prefix=${prefix}/debug
ras0219-msft Sep 4, 2020
59449bc
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Sep 5, 2020
89dc0fa
[mongo-c-driver][libbson] Write VERSION_CURRENT in portfile instead o…
ras0219-msft Sep 5, 2020
27ab233
[x265] Do not link libc++ in .pc file
ras0219-msft Sep 7, 2020
d2048de
[vcpkg_fixup_pkgconfig] Handle VCPKG_LIBRARY_LINKAGE to avoid needing…
ras0219-msft Sep 16, 2020
4d686f1
[vcpkg_fixup_pkgconfig] Remove detection of individual libraries
ras0219-msft Sep 23, 2020
96562b1
Merge branch 'master' of https://github.com/microsoft/vcpkg into HEAD
ras0219-msft Oct 6, 2020
646b92f
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Oct 8, 2020
53f75f0
Merge branch 'master' of https://github.com/microsoft/vcpkg into HEAD
ras0219-msft Oct 12, 2020
fb00768
[vcpkg_install_msbuild] Revert changes
ras0219-msft Oct 12, 2020
999bd92
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Oct 16, 2020
0411d82
[vcpkg_fixup_pkgconfig] Address CR comments
ras0219-msft Oct 16, 2020
3b25eaa
Merge branch 'master' of https://github.com/microsoft/vcpkg into HEAD
ras0219-msft Oct 22, 2020
2088987
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Oct 23, 2020
7697d0a
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Oct 28, 2020
e57db43
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Nov 25, 2020
1382ae3
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Nov 28, 2020
c539382
[vcpkg_fixup_pkgconfig] Address CR comments
ras0219-msft Nov 28, 2020
b620ba2
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Nov 30, 2020
48ccab8
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Dec 1, 2020
9a4ab14
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Dec 3, 2020
ef93146
[ceres] Disable building benchmarks
ras0219-msft Dec 5, 2020
60f62c2
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
ras0219-msft Dec 5, 2020
8192a0a
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions scripts/cmake/vcpkg_fixup_pkgconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,16 @@ function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config _system_lib
# Ensure existance in current packages and installed
find_library(CHECK_LIB_${LIBNAME}_${_config} NAMES "${LIBNAME}" PATHS ${SEARCH_PATHS} "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib" NO_DEFAULT_PATH)
if(NOT CHECK_LIB_${LIBNAME}_${_config})
message(FATAL_ERROR "CHECK_LIB_${LIBNAME}_${_config}=${CHECK_LIB_${LIBNAME}_${_config}}")
# Give time for filesystem to synchronize / antivirus to finish
ras0219 marked this conversation as resolved.
Show resolved Hide resolved
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5)
find_library(CHECK_LIB_${LIBNAME}_${_config} NAMES "${LIBNAME}" PATHS ${SEARCH_PATHS} "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib" NO_DEFAULT_PATH)
if(NOT CHECK_LIB_${LIBNAME}_${_config})
message(FATAL_ERROR "find_library() failed with arguments:\n find_library(CHECK_LIB_${LIBNAME}_${_config} NAMES \"${LIBNAME}\" PATHS ${SEARCH_PATHS} \"${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib\" NO_DEFAULT_PATH)")
else()
debug_message("CHECK_LIB_${LIBNAME}_${_config}=${CHECK_LIB_${LIBNAME}_${_config}}")
endif()
else()
debug_message(STATUS "CHECK_LIB_${LIBNAME}_${_config}=${CHECK_LIB_${LIBNAME}_${_config}}")
debug_message("CHECK_LIB_${LIBNAME}_${_config}=${CHECK_LIB_${LIBNAME}_${_config}}")
endif()
endif()
endforeach()
Expand Down