mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 21:18:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Add mingw dynamic libs triplet (#12101)

Browse Source 
* Update .gitignore

* Add mingw dynamic lib triplets

* Only copy pdbs if not using *-mingw triplets

* Using VCPKG_POLICY_DLLS_WITHOUT_LIBS as a workaround

* Rename *-mingw to *-mingw-dynamic

Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
This commit is contained in:
Long Nguyen 2020-07-07 04:20:06 +07:00 committed by GitHub
parent 8b710dea8d
commit 89dec24cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -295,14 +295,18 @@ __pycache__/
/toolsrc/msbuild.x64.release/ /toolsrc/msbuild.x64.release/
/triplets/* /triplets/*
#add vcpkg-designed triplets back in #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-uwp.cmake
!triplets/community/arm64-windows-static.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/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/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-uwp.cmake
!triplets/community/x86-windows-static.cmake !triplets/community/x86-windows-static.cmake
!triplets/community/x86-windows-static-md.cmake !triplets/community/x86-windows-static-md.cmake

2
scripts/cmake/vcpkg_copy_pdbs.cmake
View File

@ -39,7 +39,7 @@ function(vcpkg_copy_pdbs)
set(${OUTVAR} ${MSG} PARENT_SCOPE) set(${OUTVAR} ${MSG} PARENT_SCOPE)
endfunction() 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}) file(GLOB_RECURSE DLLS ${_vcp_BUILD_PATHS})
set(DLLS_WITHOUT_MATCHING_PDBS) set(DLLS_WITHOUT_MATCHING_PDBS)

7
triplets/community/arm-mingw-dynamic.cmake Normal file
View File

@ -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

7
triplets/community/arm64-mingw-dynamic.cmake Normal file
View File

@ -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

7
triplets/community/x64-mingw-dynamic.cmake Normal file
View File

@ -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

7
triplets/community/x86-mingw-dynamic.cmake Normal file
View File

@ -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