From 4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad Mon Sep 17 00:00:00 2001
From: Felipe Aburaya <felipe.aburaya@hotmail.com>
Date: Tue, 3 Jul 2018 15:39:13 +0200
Subject: [3fd] Initial port of 3FD project (#3811)

* [2fd] Initial port of 3FD project

* [3fd] Fix 2017 builds. Enable static builds in dynamic triplets. Improve vcpkg_build_msbuild().
---
 scripts/cmake/vcpkg_build_msbuild.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index db04530ef..fdf519f2c 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -15,6 +15,7 @@
 ##     [OPTIONS </p:ZLIB_INCLUDE_PATH=X>...]
 ##     [OPTIONS_RELEASE </p:ZLIB_LIB=X>...]
 ##     [OPTIONS_DEBUG </p:ZLIB_LIB=X>...]
+##     [USE_VCPKG_INTEGRATION]
 ## )
 ## ```
 ##
@@ -105,7 +106,11 @@ function(vcpkg_build_msbuild)
     endif()
 
     if(_csc_USE_VCPKG_INTEGRATION)
-        list(APPEND _csc_OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets)
+        list(
+            APPEND _csc_OPTIONS
+            /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets
+            "/p:VcpkgTriplet=${TARGET_TRIPLET}"
+        )
     endif()
 
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-- 
cgit v1.2.3