diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-07-07 04:20:06 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 14:20:06 -0700 |
| commit | 89dec24cc258f78953004a3a70acf74019649736 (patch) | |
| tree | 672a1113aa535c5a8c42778de6e4375c7f09a257 | |
| parent | 8b710dea8dd52251debbca1da8f441d0f1c68c53 (diff) | |
| download | vcpkg-89dec24cc258f78953004a3a70acf74019649736.tar.gz vcpkg-89dec24cc258f78953004a3a70acf74019649736.zip | |
[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 <bion@microsoft.com>
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_copy_pdbs.cmake | 2 | ||||
| -rw-r--r-- | triplets/community/arm-mingw-dynamic.cmake | 7 | ||||
| -rw-r--r-- | triplets/community/arm-mingw-static.cmake (renamed from triplets/community/arm-mingw.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/arm64-mingw-dynamic.cmake | 7 | ||||
| -rw-r--r-- | triplets/community/arm64-mingw-static.cmake (renamed from triplets/community/arm64-mingw.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/x64-mingw-dynamic.cmake | 7 | ||||
| -rw-r--r-- | triplets/community/x64-mingw-static.cmake (renamed from triplets/community/x64-mingw.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/x86-mingw-dynamic.cmake | 7 | ||||
| -rw-r--r-- | triplets/community/x86-mingw-static.cmake (renamed from triplets/community/x86-mingw.cmake) | 0 |
10 files changed, 37 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 273c2e415..c3973b097 100644 --- 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 index 4e9f642b5..12154d91c 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) diff --git a/triplets/community/arm-mingw-dynamic.cmake b/triplets/community/arm-mingw-dynamic.cmake new file mode 100644 index 000000000..b23870c11 --- /dev/null +++ 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 b/triplets/community/arm-mingw-static.cmake index ca99fac83..ca99fac83 100644 --- a/triplets/community/arm-mingw.cmake +++ b/triplets/community/arm-mingw-static.cmake diff --git a/triplets/community/arm64-mingw-dynamic.cmake b/triplets/community/arm64-mingw-dynamic.cmake new file mode 100644 index 000000000..30ed204ed --- /dev/null +++ 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 b/triplets/community/arm64-mingw-static.cmake index c4d88830f..c4d88830f 100644 --- a/triplets/community/arm64-mingw.cmake +++ b/triplets/community/arm64-mingw-static.cmake diff --git a/triplets/community/x64-mingw-dynamic.cmake b/triplets/community/x64-mingw-dynamic.cmake new file mode 100644 index 000000000..1f132cfe1 --- /dev/null +++ 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 b/triplets/community/x64-mingw-static.cmake index 28600f0cc..28600f0cc 100644 --- a/triplets/community/x64-mingw.cmake +++ b/triplets/community/x64-mingw-static.cmake diff --git a/triplets/community/x86-mingw-dynamic.cmake b/triplets/community/x86-mingw-dynamic.cmake new file mode 100644 index 000000000..000b36d96 --- /dev/null +++ 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 b/triplets/community/x86-mingw-static.cmake index 3769b85f0..3769b85f0 100644 --- a/triplets/community/x86-mingw.cmake +++ b/triplets/community/x86-mingw-static.cmake |