diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-02-02 15:00:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 15:00:33 -0800 |
| commit | 5793c4bd9f5d3a8e9087d444beba202e753ec4c9 (patch) | |
| tree | da656084cd9fd4685d202b8fd24d852ce7185d84 /ports | |
| parent | 3b4a4e4b5cff58ae9af6b46ad63fda71146f6ce4 (diff) | |
| download | vcpkg-5793c4bd9f5d3a8e9087d444beba202e753ec4c9.tar.gz vcpkg-5793c4bd9f5d3a8e9087d444beba202e753ec4c9.zip | |
[vcpkg] Miscellaneous internal improvements extracted from #15424 (#15677)
* [vcpkg] Miscellaneous internal improvements extracted from #15424
* [vcpkg] CR comments
* [armadillo] Use vcpkg_from_git() to workaround gitlab missing archive
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/armadillo/CONTROL | 1 | ||||
| -rw-r--r-- | ports/armadillo/portfile.cmake | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index 0939fe8f2..dee179680 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,5 +1,6 @@ Source: armadillo Version: 10.1.0 +Port-Version: 1 Homepage: https://gitlab.com/conradsnicta/armadillo-code Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use Build-Depends: blas, lapack diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 7ec7bdad0..40d8ab3d8 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO conradsnicta/armadillo-code - REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 #v 10.1.0 - SHA512 224a875d21168f80e00604185ef72cb559a86a350a037c9cd1660a6f4dcc68f2ebf6dbc073f234a3cb03d35d959adb44ec49af88b11e3aaca9e0017c9c3fcee6 - HEAD_REF 10.1.x + URL https://gitlab.com/conradsnicta/armadillo-code + REF 24b4762cbfbd3ad14c99a4854acd3560559a3195 # v10.1.0 PATCHES remove_custom_modules.patch fix-CMakePath.patch |