From 314aa4c49e9d6d5b49998349e63e55870b97b863 Mon Sep 17 00:00:00 2001 From: Albert Ziegenhagel Date: Thu, 8 Jun 2017 10:42:57 +0200 Subject: [PATCH] Rename lapack port to reference-lapack and use vcpkg_from_github --- .../0001-Fix-complex-to-int-conversion.patch | 0 ...-Fix-missing-comma-on-continued-line.patch | 0 ...complex-to-int-conversion-in-the-LAP.patch | 0 ...-Fix-missing-comma-on-continued-line.patch | 0 ...-Fix-missing-comma-on-continued-line.patch | 0 ports/{lapack => reference-lapack}/CONTROL | 0 .../portfile.cmake | 35 ++++++++++--------- 7 files changed, 19 insertions(+), 16 deletions(-) rename ports/{lapack => reference-lapack}/0001-Fix-complex-to-int-conversion.patch (100%) rename ports/{lapack => reference-lapack}/0001-Fix-missing-comma-on-continued-line.patch (100%) rename ports/{lapack => reference-lapack}/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch (100%) rename ports/{lapack => reference-lapack}/0002-Fix-missing-comma-on-continued-line.patch (100%) rename ports/{lapack => reference-lapack}/0003-Fix-missing-comma-on-continued-line.patch (100%) rename ports/{lapack => reference-lapack}/CONTROL (100%) rename ports/{lapack => reference-lapack}/portfile.cmake (68%) diff --git a/ports/lapack/0001-Fix-complex-to-int-conversion.patch b/ports/reference-lapack/0001-Fix-complex-to-int-conversion.patch similarity index 100% rename from ports/lapack/0001-Fix-complex-to-int-conversion.patch rename to ports/reference-lapack/0001-Fix-complex-to-int-conversion.patch diff --git a/ports/lapack/0001-Fix-missing-comma-on-continued-line.patch b/ports/reference-lapack/0001-Fix-missing-comma-on-continued-line.patch similarity index 100% rename from ports/lapack/0001-Fix-missing-comma-on-continued-line.patch rename to ports/reference-lapack/0001-Fix-missing-comma-on-continued-line.patch diff --git a/ports/lapack/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch b/ports/reference-lapack/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch similarity index 100% rename from ports/lapack/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch rename to ports/reference-lapack/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch diff --git a/ports/lapack/0002-Fix-missing-comma-on-continued-line.patch b/ports/reference-lapack/0002-Fix-missing-comma-on-continued-line.patch similarity index 100% rename from ports/lapack/0002-Fix-missing-comma-on-continued-line.patch rename to ports/reference-lapack/0002-Fix-missing-comma-on-continued-line.patch diff --git a/ports/lapack/0003-Fix-missing-comma-on-continued-line.patch b/ports/reference-lapack/0003-Fix-missing-comma-on-continued-line.patch similarity index 100% rename from ports/lapack/0003-Fix-missing-comma-on-continued-line.patch rename to ports/reference-lapack/0003-Fix-missing-comma-on-continued-line.patch diff --git a/ports/lapack/CONTROL b/ports/reference-lapack/CONTROL similarity index 100% rename from ports/lapack/CONTROL rename to ports/reference-lapack/CONTROL diff --git a/ports/lapack/portfile.cmake b/ports/reference-lapack/portfile.cmake similarity index 68% rename from ports/lapack/portfile.cmake rename to ports/reference-lapack/portfile.cmake index 5b82c621999a5b..f5edf08fec3ebf 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/reference-lapack/portfile.cmake @@ -1,24 +1,27 @@ include(vcpkg_common_functions) -set(LAPACK_VERSION "3.7.0") -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lapack-${LAPACK_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Reference-LAPACK/lapack/archive/v${LAPACK_VERSION}.zip" - FILENAME "lapack-v${LAPACK_VERSION}.zip" - SHA512 7ea3f196f8ec9926072ef8242aabdc24c39065b99d66b71795c07866bf567c72583ccb77504fa0f12277c313d1c1e2c03c4c3cfd67e344bd176d0e36ed6b16e4 -) -vcpkg_extract_source_archive(${ARCHIVE}) +set(LAPACK_VERSION "3.7.0") -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-missing-comma-on-continued-line.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-missing-comma-on-continued-line.patch - ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-missing-comma-on-continued-line.patch - ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-complex-to-int-conversion.patch - ${CMAKE_CURRENT_LIST_DIR}/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "Reference-LAPACK/lapack" + REF "v${LAPACK_VERSION}" + SHA512 f10fbe711ee021b5f21eca6e68c0b59d2c739794061ce353c8476333441a3a11f98e5bb7e42f2abc6e25c396eca5a8b7b5705eb6ed75d3191e8182dc7dd20b90 + HEAD_REF "master" ) +if(NOT VCPKG_USE_HEAD_VERSION) + vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-missing-comma-on-continued-line.patch + ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-missing-comma-on-continued-line.patch + ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-missing-comma-on-continued-line.patch + ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-complex-to-int-conversion.patch + ${CMAKE_CURRENT_LIST_DIR}/0001-fixes-some-more-complex-to-int-conversion-in-the-LAP.patch + ) +endif() + vcpkg_enable_fortran() vcpkg_configure_cmake(