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

* 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 <[email protected]>
microsoft · Jul 6, 2020 · 89dec24 · 89dec24
1 parent 8b710de
commit 89dec24
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -295,14 +295,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

diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake
@@ -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)

diff --git a/triplets/community/arm-mingw-dynamic.cmake b/triplets/community/arm-mingw-dynamic.cmake
@@ -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)
diff --git a/triplets/community/arm-mingw.cmake → triplets/community/arm-mingw-static.cmake b/triplets/community/arm-mingw.cmake → triplets/community/arm-mingw-static.cmake
diff --git a/triplets/community/arm64-mingw-dynamic.cmake b/triplets/community/arm64-mingw-dynamic.cmake
@@ -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)
diff --git a/triplets/community/arm64-mingw.cmake → triplets/community/arm64-mingw-static.cmake b/triplets/community/arm64-mingw.cmake → triplets/community/arm64-mingw-static.cmake
diff --git a/triplets/community/x64-mingw-dynamic.cmake b/triplets/community/x64-mingw-dynamic.cmake
@@ -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)
diff --git a/triplets/community/x64-mingw.cmake → triplets/community/x64-mingw-static.cmake b/triplets/community/x64-mingw.cmake → triplets/community/x64-mingw-static.cmake
diff --git a/triplets/community/x86-mingw-dynamic.cmake b/triplets/community/x86-mingw-dynamic.cmake
@@ -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)
diff --git a/triplets/community/x86-mingw.cmake → triplets/community/x86-mingw-static.cmake b/triplets/community/x86-mingw.cmake → triplets/community/x86-mingw-static.cmake