From 35722330be76f3d692672f83ebcc1503cff1766b Mon Sep 17 00:00:00 2001 From: jasjuang Date: Fri, 20 Oct 2017 21:38:25 -0700 Subject: [PATCH 1/2] [eigen3] use vcpkg_from_github to enable install from --head --- ports/eigen3/CONTROL | 2 +- ports/eigen3/portfile.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index 1e61ce95f..fe0641a98 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,3 @@ Source: eigen3 -Version: 3.3.4-1 +Version: 3.3.4-2 Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index a4922f008..1e08d5ddf 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -1,12 +1,12 @@ -#header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-5a0156e40feb) -vcpkg_download_distfile(ARCHIVE - URLS "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2" - FILENAME "eigen-3.3.4.tar.bz2" - SHA512 d67a3fd8f7ce811af65fc1d43ec347dadf9c643a49135f7e455fc303773bad09e80a125282c7dfca7a1993b79e1f66576ac92418119fbb0fa50c1a581b957c0d + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RLovelett/eigen + REF 3.3.4 + SHA512 b9f6bc74d79aaa7c4cb0c97739ba08c9b0570386f87c4225c06326e734fc27b9a7347a257079cae7954b6dbf599acb47d65037863b01ef5b1ff4ef7a09e3e674 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} From 0f66824fd8b8d28bf7a519e5db1e1bd3ce08f1dd Mon Sep 17 00:00:00 2001 From: jasjuang Date: Sat, 21 Oct 2017 08:15:05 -0700 Subject: [PATCH 2/2] use vcpkg_from_bitbucket --- ports/eigen3/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 1e08d5ddf..7cae703ad 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -vcpkg_from_github( +vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH - REPO RLovelett/eigen + REPO eigen/eigen REF 3.3.4 - SHA512 b9f6bc74d79aaa7c4cb0c97739ba08c9b0570386f87c4225c06326e734fc27b9a7347a257079cae7954b6dbf599acb47d65037863b01ef5b1ff4ef7a09e3e674 + SHA512 4077a5c3b95e3573774ccd3fe6c7233cb4b83db2358c19b43ea796925bd0201451d8632bddc5d68b1b57bbf67c5473a8908926eed065a745689a2acec9711d5c HEAD_REF master )