From 6e9d17f73c01c3ad07875ca79196ed2f5e2d3896 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 8 Nov 2016 14:12:49 -0800
Subject: Introduce BUILD_INFO file. Significant change in the way
 static/dynamic is handled

---
 scripts/ports.cmake | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 44cb386be..8d86fa6fa 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -71,6 +71,10 @@ if(CMD MATCHES "^BUILD$")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
     include(${CURRENT_PORT_DIR}/portfile.cmake)
+
+    set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO)
+    file(WRITE  ${BUILD_INFO_FILE_PATH} "CRTLinkage: ${VCPKG_CRT_LINKAGE}\n")
+    file(APPEND ${BUILD_INFO_FILE_PATH} "LibraryLinkage: ${VCPKG_LIBRARY_LINKAGE}")
 elseif(CMD MATCHES "^CREATE$")
     file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR)
     file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS)
-- 
cgit v1.2.3


From 1808d461b0e8793445b87eb8ceed71d5ac7aca6e Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 8 Nov 2016 14:25:47 -0800
Subject: triplet is now automatically included before portfiles.

Also remove trailing whitespaces from portfiles
---
 scripts/ports.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 8d86fa6fa..762997491 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -70,6 +70,7 @@ if(CMD MATCHES "^BUILD$")
     endif()
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
+    include(${CMAKE_TRIPLET_FILE})
     include(${CURRENT_PORT_DIR}/portfile.cmake)
 
     set(BUILD_INFO_FILE_PATH ${CURRENT_PACKAGES_DIR}/BUILD_INFO)
-- 
cgit v1.2.3


From e642767c84ce5007660efb622fc7c158540f34d4 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 8 Nov 2016 14:45:30 -0800
Subject: Remove triplet inclusion from the template portfile

---
 scripts/templates/portfile.in.cmake | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake
index 804d8d216..c848b6445 100644
--- a/scripts/templates/portfile.in.cmake
+++ b/scripts/templates/portfile.in.cmake
@@ -6,7 +6,6 @@
 #   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
 #
 
-include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/@ROOT_NAME@)
 vcpkg_download_distfile(ARCHIVE
-- 
cgit v1.2.3