Skip to content

Feature/support non standard vcpkg configs #155

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
merged 9 commits into from
Oct 8, 2020
Merged

Feature/support non standard vcpkg configs #155

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
edfab92
added support for x86 and win md/mt
vimanyu Oct 3, 2020
10f8151
fixed typo
vimanyu Oct 3, 2020
506748a
handling cmake configure for x86 on windows
vimanyu Oct 3, 2020
1046d8b
Print useful info after vcpkg step
vimanyu Oct 6, 2020
b7beb68
added function to retreive path to vcpkg cmake toolchain file
vimanyu Oct 6, 2020
9ff1d32
changing default for crt_linkage
vimanyu Oct 6, 2020
b425b97
addressed code review notes
vimanyu Oct 6, 2020
25b2228
addressed PR comments
vimanyu Oct 7, 2020
76836a4
Merge branch 'dev' into feature/support-non-standard-vcpkg-configs
vimanyu Oct 8, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed typo
  • Loading branch information
@vimanyu
vimanyu committed Oct 3, 2020
commit 10f8151c1568cad9a7503a63452e2bb86d3d51b5
2 changes: 1 addition & 1 deletion scripts/gha/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def create_vcpkg_triplet(arch, crt_linkage):
Eg: 'x86-windows-dynamic'
"""
contents = [ 'VCPKG_TARGET_ARCHITECTURE {0}'.format(arch),
'VCPLG_CRT_LINKAGE {0}'.format(crt_linkage),
'VCPKG_CRT_LINKAGE {0}'.format(crt_linkage),
'VCPKG_LIBRARY_LINKAGE static']

contents = ['set({0})\n'.format(content) for content in contents]
Expand Down