Skip to content

[vcpkg-cmake-config] fix up cmake_current_packages_dir #20439

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

Merged
BillyONeal merged 19 commits into from
Dec 9, 2021
Merged

[vcpkg-cmake-config] fix up cmake_current_packages_dir #20439

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1850fd3
[vcpkg-cmake-config] fix up cmake_current_packages_dir
PhoebeHui Sep 30, 2021
da9e981
Small changes
PhoebeHui Sep 30, 2021
78a6896
Merge branch 'master' into dev/Phoebe/vcpkg-cmake-config
PhoebeHui Oct 19, 2021
981066d
Address the review suggestion
PhoebeHui Oct 19, 2021
32b14db
Update ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
JackBoosY Oct 19, 2021
e8b7136
Update the baseline version
PhoebeHui Oct 20, 2021
f83c0eb
Merge branch 'master' into dev/Phoebe/vcpkg-cmake-config
PhoebeHui Nov 5, 2021
dbac141
Address the review suggestions
PhoebeHui Nov 5, 2021
5e076f0
Merge from master
PhoebeHui Nov 11, 2021
91ce412
Merge branch 'master' into dev/Phoebe/vcpkg-cmake-config
PhoebeHui Nov 18, 2021
a30d396
Address the review suggestions
PhoebeHui Nov 18, 2021
ae218ff
Merge branch 'master' into dev/Phoebe/vcpkg-cmake-config
PhoebeHui Nov 23, 2021
8438aeb
Merge branch 'master' into dev/Phoebe/vcpkg-cmake-config
PhoebeHui Dec 1, 2021
36790fb
fix up VCPKG_IMPORT_PREFIX if the file being modified at a deep subpath
PhoebeHui Dec 1, 2021
d30bd43
Fix regressions
PhoebeHui Dec 2, 2021
ad86850
Remove out of date comments about multiconfig generators that are no …
BillyONeal Dec 7, 2021
83092db
Fix version database.
BillyONeal Dec 7, 2021
6853f97
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 7, 2021
588a14c
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 8, 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 ports/vcpkg-cmake-config/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "vcpkg-cmake-config",
"version-date": "2021-11-01"
"version-date": "2021-11-18"
}
16 changes: 12 additions & 4 deletions ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,19 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]]
#and/or
#\$<\$<NOT:\$<CONFIG:DEBUG>>:${CURRENT_INSTALLED_DIR}/lib/somelib>
#with ${CURRENT_INSTALLED_DIR} being fully expanded
string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${_IMPORT_PREFIX}]] contents "${contents}")

# Patch out any remaining absolute references
string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}")
Comment thread
BillyONeal marked this conversation as resolved.
file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir)
string(REPLACE "${cmake_current_packages_dir}" [[${_IMPORT_PREFIX}]] contents "${contents}")
string(REPLACE "${cmake_current_packages_dir}" [[${VCPKG_IMPORT_PREFIX}]] contents "${contents}")

string(FIND "${contents}" [[${VCPKG_IMPORT_PREFIX}]] index)
if (NOT index STREQUAL "-1")
string(PREPEND contents
[[
get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}" PATH)
get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH)
Comment thread
PhoebeHui marked this conversation as resolved.
Outdated
]]
)
endif()

file(WRITE "${main_cmake}" "${contents}")
endforeach()
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7049,7 +7049,7 @@
"port-version": 0
},
"vcpkg-cmake-config": {
"baseline": "2021-11-01",
"baseline": "2021-11-18",
"port-version": 0
},
"vcpkg-gfortran": {
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-cmake-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b698e2e765bba714b580c49027133343efaa96e8",
"version-date": "2021-11-18",
"port-version": 0
},
{
"git-tree": "38a87ee8edd9ea8e8fff604fbcb785661a8d0e28",
"version-date": "2021-11-01",
Expand Down