From d22c69784744cc460d0c2390e11988831191e01c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 25 Jun 2020 11:57:01 +0700 Subject: [PATCH 1/5] Update .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 65b0ddb81b0fbd..2b9e478ee8889f 100644 --- a/.gitignore +++ b/.gitignore @@ -294,13 +294,17 @@ __pycache__/ /triplets/* #add vcpkg-designed triplets back in !triplets/community/arm64-mingw.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-static.cmake !triplets/community/arm-windows.cmake !triplets/community/x64-mingw.cmake +!triplets/community/x64-mingw-static.cmake !triplets/community/x64-windows-static-md.cmake !triplets/community/x86-mingw.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 From 07f0fd1b3e4ec2d95b9bedcbcd3a15b2fdcdae3f Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 25 Jun 2020 12:13:44 +0700 Subject: [PATCH 2/5] Add mingw dynamic lib triplets --- triplets/community/arm-mingw-static.cmake | 6 ++++++ triplets/community/arm-mingw.cmake | 3 ++- triplets/community/arm64-mingw-static.cmake | 6 ++++++ triplets/community/arm64-mingw.cmake | 3 ++- triplets/community/x64-mingw-static.cmake | 6 ++++++ triplets/community/x64-mingw.cmake | 3 ++- triplets/community/x86-mingw-static.cmake | 6 ++++++ triplets/community/x86-mingw.cmake | 3 ++- 8 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 triplets/community/arm-mingw-static.cmake create mode 100644 triplets/community/arm64-mingw-static.cmake create mode 100644 triplets/community/x64-mingw-static.cmake create mode 100644 triplets/community/x86-mingw-static.cmake diff --git a/triplets/community/arm-mingw-static.cmake b/triplets/community/arm-mingw-static.cmake new file mode 100644 index 00000000000000..ca99fac8391695 --- /dev/null +++ b/triplets/community/arm-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/triplets/community/arm-mingw.cmake b/triplets/community/arm-mingw.cmake index ca99fac8391695..64ae2a27d9895e 100644 --- a/triplets/community/arm-mingw.cmake +++ b/triplets/community/arm-mingw.cmake @@ -1,6 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE arm) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + diff --git a/triplets/community/arm64-mingw-static.cmake b/triplets/community/arm64-mingw-static.cmake new file mode 100644 index 00000000000000..c4d88830f3bde7 --- /dev/null +++ b/triplets/community/arm64-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/triplets/community/arm64-mingw.cmake b/triplets/community/arm64-mingw.cmake index c4d88830f3bde7..5f9225ff48d4f5 100644 --- a/triplets/community/arm64-mingw.cmake +++ b/triplets/community/arm64-mingw.cmake @@ -1,6 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + diff --git a/triplets/community/x64-mingw-static.cmake b/triplets/community/x64-mingw-static.cmake new file mode 100644 index 00000000000000..28600f0ccd70ae --- /dev/null +++ b/triplets/community/x64-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/triplets/community/x64-mingw.cmake b/triplets/community/x64-mingw.cmake index 28600f0ccd70ae..fd7ee11911b428 100644 --- a/triplets/community/x64-mingw.cmake +++ b/triplets/community/x64-mingw.cmake @@ -1,6 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + diff --git a/triplets/community/x86-mingw-static.cmake b/triplets/community/x86-mingw-static.cmake new file mode 100644 index 00000000000000..3769b85f0c7c25 --- /dev/null +++ b/triplets/community/x86-mingw-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_ENV_PASSTHROUGH PATH) + +set(VCPKG_CMAKE_SYSTEM_NAME MinGW) diff --git a/triplets/community/x86-mingw.cmake b/triplets/community/x86-mingw.cmake index 3769b85f0c7c25..966edfc674db0d 100644 --- a/triplets/community/x86-mingw.cmake +++ b/triplets/community/x86-mingw.cmake @@ -1,6 +1,7 @@ set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) + From 3da9ff63e9638e55a800b4f555247294f73656f2 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 25 Jun 2020 13:04:34 +0700 Subject: [PATCH 3/5] Only copy pdbs if not using *-mingw triplets --- scripts/cmake/vcpkg_copy_pdbs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake index 4e9f642b5b4961..12154d91c4d94d 100644 --- 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) From 2b6ecf8a19c202bf98ef3dc8319e693f21eba8d9 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 30 Jun 2020 12:50:27 +0700 Subject: [PATCH 4/5] Using VCPKG_POLICY_DLLS_WITHOUT_LIBS as a workaround --- triplets/community/arm-mingw.cmake | 2 +- triplets/community/arm64-mingw.cmake | 2 +- triplets/community/x64-mingw.cmake | 2 +- triplets/community/x86-mingw.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/triplets/community/arm-mingw.cmake b/triplets/community/arm-mingw.cmake index 64ae2a27d9895e..b23870c11a5b08 100644 --- a/triplets/community/arm-mingw.cmake +++ b/triplets/community/arm-mingw.cmake @@ -4,4 +4,4 @@ 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 b/triplets/community/arm64-mingw.cmake index 5f9225ff48d4f5..30ed204ed78477 100644 --- a/triplets/community/arm64-mingw.cmake +++ b/triplets/community/arm64-mingw.cmake @@ -4,4 +4,4 @@ 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 b/triplets/community/x64-mingw.cmake index fd7ee11911b428..1f132cfe15672d 100644 --- a/triplets/community/x64-mingw.cmake +++ b/triplets/community/x64-mingw.cmake @@ -4,4 +4,4 @@ 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 b/triplets/community/x86-mingw.cmake index 966edfc674db0d..000b36d9607789 100644 --- a/triplets/community/x86-mingw.cmake +++ b/triplets/community/x86-mingw.cmake @@ -4,4 +4,4 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) - +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) From 96b7b7a9fd62f40616d5eb761f1f86aa44599672 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 3 Jul 2020 22:43:55 +0700 Subject: [PATCH 5/5] Rename *-mingw to *-mingw-dynamic --- .gitignore | 8 ++++---- .../{arm-mingw.cmake => arm-mingw-dynamic.cmake} | 0 .../{arm64-mingw.cmake => arm64-mingw-dynamic.cmake} | 0 .../{x64-mingw.cmake => x64-mingw-dynamic.cmake} | 0 .../{x86-mingw.cmake => x86-mingw-dynamic.cmake} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename triplets/community/{arm-mingw.cmake => arm-mingw-dynamic.cmake} (100%) rename triplets/community/{arm64-mingw.cmake => arm64-mingw-dynamic.cmake} (100%) rename triplets/community/{x64-mingw.cmake => x64-mingw-dynamic.cmake} (100%) rename triplets/community/{x86-mingw.cmake => x86-mingw-dynamic.cmake} (100%) diff --git a/.gitignore b/.gitignore index 2b9e478ee8889f..388e736e852c12 100644 --- a/.gitignore +++ b/.gitignore @@ -293,17 +293,17 @@ __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 diff --git a/triplets/community/arm-mingw.cmake b/triplets/community/arm-mingw-dynamic.cmake similarity index 100% rename from triplets/community/arm-mingw.cmake rename to triplets/community/arm-mingw-dynamic.cmake diff --git a/triplets/community/arm64-mingw.cmake b/triplets/community/arm64-mingw-dynamic.cmake similarity index 100% rename from triplets/community/arm64-mingw.cmake rename to triplets/community/arm64-mingw-dynamic.cmake diff --git a/triplets/community/x64-mingw.cmake b/triplets/community/x64-mingw-dynamic.cmake similarity index 100% rename from triplets/community/x64-mingw.cmake rename to triplets/community/x64-mingw-dynamic.cmake diff --git a/triplets/community/x86-mingw.cmake b/triplets/community/x86-mingw-dynamic.cmake similarity index 100% rename from triplets/community/x86-mingw.cmake rename to triplets/community/x86-mingw-dynamic.cmake