diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /triplets | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'triplets')
| -rw-r--r-- | triplets/community/arm-mingw.cmake | 6 | ||||
| -rw-r--r-- | triplets/community/arm-windows.cmake (renamed from triplets/arm-windows.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/arm64-mingw.cmake | 6 | ||||
| -rw-r--r-- | triplets/community/arm64-uwp.cmake (renamed from triplets/arm64-uwp.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/x64-mingw.cmake | 6 | ||||
| -rw-r--r-- | triplets/community/x86-mingw.cmake | 6 | ||||
| -rw-r--r-- | triplets/community/x86-uwp.cmake (renamed from triplets/x86-uwp.cmake) | 0 | ||||
| -rw-r--r-- | triplets/community/x86-windows-static.cmake (renamed from triplets/x86-windows-static.cmake) | 0 |
8 files changed, 24 insertions, 0 deletions
diff --git a/triplets/community/arm-mingw.cmake b/triplets/community/arm-mingw.cmake new file mode 100644 index 000000000..ca99fac83 --- /dev/null +++ b/triplets/community/arm-mingw.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/arm-windows.cmake b/triplets/community/arm-windows.cmake index 3aa75933f..3aa75933f 100644 --- a/triplets/arm-windows.cmake +++ b/triplets/community/arm-windows.cmake diff --git a/triplets/community/arm64-mingw.cmake b/triplets/community/arm64-mingw.cmake new file mode 100644 index 000000000..c4d88830f --- /dev/null +++ b/triplets/community/arm64-mingw.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/arm64-uwp.cmake b/triplets/community/arm64-uwp.cmake index b37c34e87..b37c34e87 100644 --- a/triplets/arm64-uwp.cmake +++ b/triplets/community/arm64-uwp.cmake diff --git a/triplets/community/x64-mingw.cmake b/triplets/community/x64-mingw.cmake new file mode 100644 index 000000000..28600f0cc --- /dev/null +++ b/triplets/community/x64-mingw.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/x86-mingw.cmake b/triplets/community/x86-mingw.cmake new file mode 100644 index 000000000..3769b85f0 --- /dev/null +++ b/triplets/community/x86-mingw.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/x86-uwp.cmake b/triplets/community/x86-uwp.cmake index 13b9d77c2..13b9d77c2 100644 --- a/triplets/x86-uwp.cmake +++ b/triplets/community/x86-uwp.cmake diff --git a/triplets/x86-windows-static.cmake b/triplets/community/x86-windows-static.cmake index c855f0caa..c855f0caa 100644 --- a/triplets/x86-windows-static.cmake +++ b/triplets/community/x86-windows-static.cmake |