From d83edc84f72d29b417fae00603d657732a116f26 Mon Sep 17 00:00:00 2001 From: grdowns Date: Fri, 12 Apr 2019 02:53:29 -0700 Subject: Bump version numbers, fix system name check --- ports/clapack/CONTROL | 2 +- ports/openblas/CONTROL | 2 +- ports/openblas/portfile.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL index c30f5eb95..284e6372c 100644 --- a/ports/clapack/CONTROL +++ b/ports/clapack/CONTROL @@ -1,4 +1,4 @@ Source: clapack -Version: 3.2.1-2 +Version: 3.2.1-3 Description: CLAPACK (f2c'ed version of LAPACK) Build-Depends: openblas diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL index 980b87fb6..c7f019185 100644 --- a/ports/openblas/CONTROL +++ b/ports/openblas/CONTROL @@ -1,3 +1,3 @@ Source: openblas -Version: 0.3.5-1 +Version: 0.3.5-2 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 665f7024d..dae730b6f 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -16,7 +16,7 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "openblas can only be built for x64 currently") endif() -if(MSVC) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") message("openblas currenly only supports dynamic library linkage") set(VCPKG_LIBRARY_LINKAGE "dynamic") -- cgit v1.2.3