diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-13 14:15:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 14:15:56 -0700 |
| commit | e387f314a832a411df643ddaf4e7e8be525ebfa4 (patch) | |
| tree | 5e1c21f443be453bb6f0583280af42294ce2308b /ports | |
| parent | ca0ea93e6400a4c13ac3ab34fbb7ce49086e2081 (diff) | |
| parent | 26b9278a4c73eebb2bf21beccac168d603206126 (diff) | |
| download | vcpkg-e387f314a832a411df643ddaf4e7e8be525ebfa4.tar.gz vcpkg-e387f314a832a411df643ddaf4e7e8be525ebfa4.zip | |
Merge pull request #775 from Mixaill/msvs2017-mpir-winsdk
[mpir] detect Windows SDK version (was: retarget MSVS2017 to Windows 10 SDK)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/mpir/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpir/portfile.cmake | 10 |
2 files changed, 5 insertions, 7 deletions
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..1595a6533 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)
@@ -27,10 +27,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")
@@ -43,12 +43,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
@@ -77,7 +75,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")
|