mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:58:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openblas] Ensure we build without lapack on all platforms (#6542)

Browse Source 
* [openblas] Ensure we build without lapack on all platforms

* [openblas] Bump version number
This commit is contained in:
Sean Warren 2019-05-22 09:56:37 +10:00 committed by Victor Romero
parent 75bcb1c131
commit e16f9c29a0
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openblas/CONTROL
View File

@ -1,3 +1,3 @@
Source: openblas Source: openblas
Version: 0.3.6-1 Version: 0.3.6-2
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.

22
ports/openblas/portfile.cmake
View File

@ -38,6 +38,9 @@ vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}") set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}")
set(COMMON_OPTIONS
-DBUILD_WITHOUT_LAPACK=ON)
# for UWP version, must build non uwp first for helper # for UWP version, must build non uwp first for helper
# binaries. # binaries.
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -51,7 +54,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON OPTIONS
${COMMON_OPTIONS}
-DTARGET=NEHALEM
) )
# add just built path to environment for gen_config_h.exe, # add just built path to environment for gen_config_h.exe,
@ -67,17 +72,24 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON OPTIONS
"-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") ${COMMON_OPTIONS}
-DCMAKE_SYSTEM_PROCESSOR=AMD64
-DVS_WINRT_COMPONENT=TRUE
"-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
elseif(NOT VCPKG_CMAKE_SYSTEM_NAME) elseif(NOT VCPKG_CMAKE_SYSTEM_NAME)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DBUILD_WITHOUT_LAPACK=ON) OPTIONS
${COMMON_OPTIONS})
else() else()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON) OPTIONS
${COMMON_OPTIONS}
-DCMAKE_SYSTEM_PROCESSOR=AMD64
-DNOFORTRAN=ON)
endif() endif()