diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-05-22 09:56:37 +1000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-21 16:56:37 -0700 |
| commit | e16f9c29a05aa178ce8a476a293723ab92f08f89 (patch) | |
| tree | 136709830444ea3b2b9347f864b1288827b24f2b | |
| parent | 75bcb1c131c601d1ce4bb8a5ec761e058a0faeab (diff) | |
| download | vcpkg-e16f9c29a05aa178ce8a476a293723ab92f08f89.tar.gz vcpkg-e16f9c29a05aa178ce8a476a293723ab92f08f89.zip | |
[openblas] Ensure we build without lapack on all platforms (#6542)
* [openblas] Ensure we build without lapack on all platforms
* [openblas] Bump version number
| -rw-r--r-- | ports/openblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openblas/portfile.cmake | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL index cabd86f8b..40249c332 100644 --- a/ports/openblas/CONTROL +++ b/ports/openblas/CONTROL @@ -1,3 +1,3 @@ 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. diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 7510fba6c..cccb5e3b1 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -38,6 +38,9 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) 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 # binaries. if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -51,7 +54,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_configure_cmake( 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, @@ -67,17 +72,24 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON - "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") + OPTIONS + ${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) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DBUILD_WITHOUT_LAPACK=ON) + OPTIONS + ${COMMON_OPTIONS}) else() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON) + OPTIONS + ${COMMON_OPTIONS} + -DCMAKE_SYSTEM_PROCESSOR=AMD64 + -DNOFORTRAN=ON) endif() |