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] Add mingw dynamic libs triplet #12101

Merged
merged 6 commits into from
Jul 6, 2020
Merged

[vcpkg] Add mingw dynamic libs triplet #12101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d22c697
Update .gitignore
longnguyen2004 Jun 25, 2020
07f0fd1
Add mingw dynamic lib triplets
longnguyen2004 Jun 25, 2020
3da9ff6
Only copy pdbs if not using *-mingw triplets
longnguyen2004 Jun 25, 2020
32345f1
Merge remote-tracking branch 'origin/master' into mingw-dynamic-linkage
BillyONeal Jun 30, 2020
2b6ecf8
Using VCPKG_POLICY_DLLS_WITHOUT_LIBS as a workaround
longnguyen2004 Jun 30, 2020
96b7b7a
Rename *-mingw to *-mingw-dynamic
longnguyen2004 Jul 3, 2020
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
12 changes: 8 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ __pycache__/
/toolsrc/msbuild.x64.release/
/triplets/*
#add vcpkg-designed triplets back in
!triplets/community/arm64-mingw.cmake
!triplets/community/arm64-mingw-dynamic.cmake
!triplets/community/arm64-mingw-static.cmake
!triplets/community/arm64-uwp.cmake
!triplets/community/arm64-windows-static.cmake
!triplets/community/arm-mingw.cmake
!triplets/community/arm-mingw-dynamic.cmake
!triplets/community/arm-mingw-static.cmake
!triplets/community/arm-windows.cmake
!triplets/community/x64-mingw.cmake
!triplets/community/x64-mingw-dynamic.cmake
!triplets/community/x64-mingw-static.cmake
!triplets/community/x64-windows-static-md.cmake
!triplets/community/x86-mingw.cmake
!triplets/community/x86-mingw-dynamic.cmake
!triplets/community/x86-mingw-static.cmake
!triplets/community/x86-uwp.cmake
!triplets/community/x86-windows-static.cmake
!triplets/community/x86-windows-static-md.cmake
Expand Down
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_copy_pdbs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function(vcpkg_copy_pdbs)
set(${OUTVAR} ${MSG} PARENT_SCOPE)
endfunction()

if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND NOT VCPKG_TARGET_IS_MINGW)
file(GLOB_RECURSE DLLS ${_vcp_BUILD_PATHS})

set(DLLS_WITHOUT_MATCHING_PDBS)
Expand Down
7 changes: 7 additions & 0 deletions triplets/community/arm-mingw-dynamic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set(VCPKG_TARGET_ARCHITECTURE arm)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
0 triplets/community/arm-mingw.cmake → triplets/community/arm-mingw-static.cmake
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions triplets/community/arm64-mingw-dynamic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set(VCPKG_TARGET_ARCHITECTURE arm64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
0 triplets/community/arm64-mingw.cmake → triplets/community/arm64-mingw-static.cmake
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions triplets/community/x64-mingw-dynamic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
0 triplets/community/x64-mingw.cmake → triplets/community/x64-mingw-static.cmake
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions triplets/community/x86-mingw-dynamic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
set(VCPKG_TARGET_ARCHITECTURE x86)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_ENV_PASSTHROUGH PATH)

set(VCPKG_CMAKE_SYSTEM_NAME MinGW)
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
0 triplets/community/x86-mingw.cmake → triplets/community/x86-mingw-static.cmake
View file
Open in desktop
File renamed without changes.