diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-04-24 04:41:42 +0800 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-23 13:41:42 -0700 |
| commit | 91aa28f14ded660d2bd5d0388d37460816652132 (patch) | |
| tree | c2f3e4567eab8b641a10bbb2d783b922821afd88 | |
| parent | 8da8c0a9f639abd9bba4ab9c8754fdb477fc6e34 (diff) | |
| download | vcpkg-91aa28f14ded660d2bd5d0388d37460816652132.tar.gz vcpkg-91aa28f14ded660d2bd5d0388d37460816652132.zip | |
[openblas]Disable cross-compiling to fix uwp build. (#6181)
| -rw-r--r-- | ports/openblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openblas/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/openblas/uwp.patch | 16 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL index c7f019185..11a3d1741 100644 --- a/ports/openblas/CONTROL +++ b/ports/openblas/CONTROL @@ -1,3 +1,3 @@ Source: openblas -Version: 0.3.5-2 +Version: 0.3.5-3 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 dae730b6f..967a0dbb7 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -21,6 +21,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore message("openblas currenly only supports dynamic library linkage") set(VCPKG_LIBRARY_LINKAGE "dynamic") endif() + set(CMAKE_CROSSCOMPILING OFF) endif() vcpkg_from_github( diff --git a/ports/openblas/uwp.patch b/ports/openblas/uwp.patch index 93d0795a6..50a8e9b29 100644 --- a/ports/openblas/uwp.patch +++ b/ports/openblas/uwp.patch @@ -1,3 +1,4 @@ +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake --- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600 +++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600 @@ -37,6 +37,9 @@ @@ -32,3 +33,18 @@ # append config data from getarch_2nd to the TARGET file and read in CMake vars file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT}) + +diff --git a/cmake/system.cmake b/cmake/system.cmake +index a060d98..52ffa5a 100644 +--- a/cmake/system.cmake ++++ b/cmake/system.cmake +@@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET) + set(TARGET "ARMV8") + elseif(ARM) + set(TARGET "ARMV7") # TODO: Ask compiler which arch this is ++ elseif(${HOST_OS} STREQUAL "WINDOWSSTORE") ++ set(CMAKE_CROSSCOMPILING 0) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) + else() + message(FATAL_ERROR "When cross compiling, a TARGET is required.") + endif() |