diff options
| -rw-r--r-- | ports/armadillo/CONTROL | 5 | ||||
| -rw-r--r-- | ports/armadillo/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/armadillo/vcpkg.json | 10 | ||||
| -rw-r--r-- | versions/a-/armadillo.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL deleted file mode 100644 index d903f6472..000000000 --- a/ports/armadillo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: armadillo -Version: 10.2.0 -Homepage: http://arma.sourceforge.net -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 bc275cb66..4f52e9d74 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.2.0.tar.xz" - SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd + FILENAME "armadillo-10.4.0.tar.xz" + SHA512 72cf8a493e86c51c4c875076d0a9dd7c21fbfbd639064fa7a96daf4a5df02b36c93440bbae471f30d368547c6856c91fef97ce8ed2ec0526b0060588b71cd28a PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json new file mode 100644 index 000000000..19daff809 --- /dev/null +++ b/ports/armadillo/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "armadillo", + "version": "10.4.0", + "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", + "homepage": "http://arma.sourceforge.net", + "dependencies": [ + "blas", + "lapack" + ] +} diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 2dfbf6adf..036696041 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3925824cd7eed2d9fcaa092a9a543eb538d9a558", + "version": "10.4.0", + "port-version": 0 + }, + { "git-tree": "8f9484de18ab042899bdf1fd033f6522ff091225", "version-string": "10.2.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index ae6131add..e96d9fa02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -137,7 +137,7 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.2.0", + "baseline": "10.4.0", "port-version": 0 }, "arrayfire": { |