From 34ee5b3f7f640794ff1f65f65c961c86228d1ad2 Mon Sep 17 00:00:00 2001 From: Fredrik Averpil Date: Tue, 29 Jan 2019 18:17:49 +0100 Subject: [PATCH] Add triplets --- src/vcpkg/triplets/x64-linux.cmake | 5 +++++ src/vcpkg/triplets/x64-windows-static.cmake | 4 ++++ src/vcpkg/triplets/x64-windows.cmake | 4 ++++ win2016-azure-pipelines.yml | 6 ++++++ 4 files changed, 19 insertions(+) create mode 100644 src/vcpkg/triplets/x64-linux.cmake create mode 100644 src/vcpkg/triplets/x64-windows-static.cmake create mode 100644 src/vcpkg/triplets/x64-windows.cmake diff --git a/src/vcpkg/triplets/x64-linux.cmake b/src/vcpkg/triplets/x64-linux.cmake new file mode 100644 index 0000000..2b82b42 --- /dev/null +++ b/src/vcpkg/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_BUILD_TYPE release) +set(VCPKG_CMAKE_SYSTEM_NAME Linux) \ No newline at end of file diff --git a/src/vcpkg/triplets/x64-windows-static.cmake b/src/vcpkg/triplets/x64-windows-static.cmake new file mode 100644 index 0000000..3eecf02 --- /dev/null +++ b/src/vcpkg/triplets/x64-windows-static.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_BUILD_TYPE release) \ No newline at end of file diff --git a/src/vcpkg/triplets/x64-windows.cmake b/src/vcpkg/triplets/x64-windows.cmake new file mode 100644 index 0000000..31f88b2 --- /dev/null +++ b/src/vcpkg/triplets/x64-windows.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) \ No newline at end of file diff --git a/win2016-azure-pipelines.yml b/win2016-azure-pipelines.yml index 9eaf11b..8665bc0 100644 --- a/win2016-azure-pipelines.yml +++ b/win2016-azure-pipelines.yml @@ -68,6 +68,12 @@ jobs: condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Override vcpkg port files + # Copy customized triplet(s) into place + - powershell: | + cp -r -v $(src.vcpkg)/triplets/* C:/vcpkg/triplets + condition: eq( variables['Agent.OS'], 'Windows_NT' ) + displayName: Override vcpkg triplet files + # Install Python Interpreter to default location # We have to do this because pybind11 currently can't find the # Azure-provided Python: