aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-04-23 19:33:19 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-04-23 19:33:19 -0700
commitf703f60bd0064c3aeb116982812a3745817d30fe (patch)
tree0fd680761435ca105306314f768db23f8431cebe
parenta11086e3b9d560d3b73de91175c57db658e39809 (diff)
downloadvcpkg-f703f60bd0064c3aeb116982812a3745817d30fe.tar.gz
vcpkg-f703f60bd0064c3aeb116982812a3745817d30fe.zip
Add triplets for x64-linux and x64-osx
-rw-r--r--.gitignore4
-rw-r--r--triplets/x64-linux.cmake5
-rw-r--r--triplets/x64-osx.cmake5
3 files changed, 13 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 18384e3da..d105fd368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -279,7 +279,7 @@ downloads/
installed*/
packages/
scripts/buildsystems/tmp/
-#ignore custom triplets
+#ignore custom triplets
triplets/*
#add vcpkg-designed triplets back in
!triplets/arm-uwp.cmake
@@ -292,6 +292,8 @@ triplets/*
!triplets/x86-windows-static.cmake
!triplets/arm64-uwp.cmake
!triplets/arm64-windows.cmake
+!triplets/x64-linux.cmake
+!triplets/x64-osx.cmake
*.exe
*.zip
diff --git a/triplets/x64-linux.cmake b/triplets/x64-linux.cmake
new file mode 100644
index 000000000..519618463
--- /dev/null
+++ b/triplets/x64-linux.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/triplets/x64-osx.cmake b/triplets/x64-osx.cmake
new file mode 100644
index 000000000..af3a8c348
--- /dev/null
+++ b/triplets/x64-osx.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)