diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2020-02-12 11:46:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 11:46:40 -0800 |
| commit | 71a9def3df1cd418a8c00e69413f19507ab25fa8 (patch) | |
| tree | 36705b4f571dee4f1f3a533ff7041c75de3bfdb9 | |
| parent | 7365cd74ef79a1f5f7a7bd6ff064a3e573ca4baa (diff) | |
| download | vcpkg-71a9def3df1cd418a8c00e69413f19507ab25fa8.tar.gz vcpkg-71a9def3df1cd418a8c00e69413f19507ab25fa8.zip | |
Add triplets for static libraries with dynamic CRT on Windows (#10028)
* Add triplets for static libs with dynamic CRT
* Update .gitignore
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | triplets/community/x64-windows-static-md.cmake | 3 | ||||
| -rw-r--r-- | triplets/community/x86-windows-static-md.cmake | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 297819bf4..0b320879b 100644 --- a/.gitignore +++ b/.gitignore @@ -291,7 +291,6 @@ __pycache__/ /toolsrc/msbuild.x86.release/ /toolsrc/msbuild.x64.debug/ /toolsrc/msbuild.x64.release/ -#ignore custom triplets /triplets/* #add vcpkg-designed triplets back in !triplets/community/arm64-mingw.cmake @@ -299,9 +298,11 @@ __pycache__/ !triplets/community/arm-mingw.cmake !triplets/community/arm-windows.cmake !triplets/community/x64-mingw.cmake +!triplets/community/x64-windows-static-md.cmake !triplets/community/x86-mingw.cmake !triplets/community/x86-uwp.cmake !triplets/community/x86-windows-static.cmake +!triplets/community/x86-windows-static-md.cmake !triplets/arm-uwp.cmake !triplets/x64-uwp.cmake !triplets/x64-windows.cmake @@ -310,6 +311,7 @@ __pycache__/ !triplets/arm64-windows.cmake !triplets/x64-linux.cmake !triplets/x64-osx.cmake +#ignore custom triplets *.exe *.zip diff --git a/triplets/community/x64-windows-static-md.cmake b/triplets/community/x64-windows-static-md.cmake new file mode 100644 index 000000000..d7acd46a4 --- /dev/null +++ b/triplets/community/x64-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
diff --git a/triplets/community/x86-windows-static-md.cmake b/triplets/community/x86-windows-static-md.cmake new file mode 100644 index 000000000..22abeaf2d --- /dev/null +++ b/triplets/community/x86-windows-static-md.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
|