From 3379a3e8e2e27bcba243a14b31b3c3b5943b55d0 Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <me@mixaill.tk>
Date: Sun, 12 Mar 2017 15:22:05 +0300
Subject: [mpir] handle Windows SDK version properly (+1 squashed commits)

Squashed commits:

[a820112] [mpir] retarget MSVS2017 to Windows 10 SDK
---
 ports/mpir/CONTROL        | 2 +-
 ports/mpir/portfile.cmake | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'ports/mpir')

diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL
index 2b67c7c98..fc15d9b41 100644
--- a/ports/mpir/CONTROL
+++ b/ports/mpir/CONTROL
@@ -1,3 +1,3 @@
 Source: mpir
-Version: 3.0.0-1
+Version: 3.0.0-2
 Description: Multiple Precision Integers and Rationals.
\ No newline at end of file
diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake
index 96bfa9454..41ae41b01 100644
--- a/ports/mpir/portfile.cmake
+++ b/ports/mpir/portfile.cmake
@@ -16,14 +16,17 @@ if(VCPKG_PLATFORM_TOOLSET MATCHES "v141*")
 else()
     set(MSVC_VERSION 14)
 endif()
+vcpkg_get_windows_sdk(WINDOWS_SDK)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 	vcpkg_build_msbuild(
 		PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_mpir_gc/dll_mpir_gc.vcxproj
+		TARGET_PLATFORM_VERSION ${WINDOWS_SDK}
 	)
 else()
 	vcpkg_build_msbuild(
 		PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_mpir_gc/lib_mpir_gc.vcxproj
+		TARGET_PLATFORM_VERSION ${WINDOWS_SDK}
 	)
 endif()
 
-- 
cgit v1.2.3


From 32d79e94863683f5ec1720cf1d9fa5b92622b7f4 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 13 Mar 2017 14:05:04 -0700
Subject: [mpir] Portfile cleanup.

Always use the library copyright file (we do not build the executables).
Leave copying pdbs to vcpkg_copy_pdbs().
Use the newer VCPKG_TARGET_ARCHITECTURE over TRIPLET_SYSTEM_ARCH.
CMake's "MATCHES" conditional performs regex substring search, so * is not needed.
---
 ports/mpir/portfile.cmake | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'ports/mpir')

diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake
index 41ae41b01..6e01043f3 100644
--- a/ports/mpir/portfile.cmake
+++ b/ports/mpir/portfile.cmake
@@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE_FILE
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 
-if(VCPKG_PLATFORM_TOOLSET MATCHES "v141*")
+if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
     set(MSVC_VERSION 15)
 else()
     set(MSVC_VERSION 14)
@@ -30,10 +30,10 @@ else()
 	)
 endif()
 
-IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
 	SET(BUILD_ARCH "Win32")
 ELSE()
-	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+	SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
 ENDIF()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -46,12 +46,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 	)
 	file(INSTALL
 		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.dll
-		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.pdb
 		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
 	)
 	file(INSTALL
 		${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.dll
-		${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.pdb
 		DESTINATION ${CURRENT_PACKAGES_DIR}/bin
 	)
 	file(INSTALL
@@ -80,7 +78,7 @@ else()
 		${SOURCE_PATH}/lib/${BUILD_ARCH}/Release/mpir.lib
 		DESTINATION ${CURRENT_PACKAGES_DIR}/lib
 	)
-	file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
+	file(INSTALL ${SOURCE_PATH}/COPYING.lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
 endif()
 
 message(STATUS "Installing done")
-- 
cgit v1.2.3


From f44063289412d46187ce72061e8e474e90f1cc63 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 13 Mar 2017 14:06:48 -0700
Subject: [mpir] Rely on default override of WinSDK.

---
 ports/mpir/portfile.cmake | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'ports/mpir')

diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake
index 6e01043f3..1595a6533 100644
--- a/ports/mpir/portfile.cmake
+++ b/ports/mpir/portfile.cmake
@@ -16,17 +16,14 @@ if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
 else()
     set(MSVC_VERSION 14)
 endif()
-vcpkg_get_windows_sdk(WINDOWS_SDK)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
 	vcpkg_build_msbuild(
 		PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_mpir_gc/dll_mpir_gc.vcxproj
-		TARGET_PLATFORM_VERSION ${WINDOWS_SDK}
 	)
 else()
 	vcpkg_build_msbuild(
 		PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_mpir_gc/lib_mpir_gc.vcxproj
-		TARGET_PLATFORM_VERSION ${WINDOWS_SDK}
 	)
 endif()
 
-- 
cgit v1.2.3