diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index c5d72826d9..abc372c547 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -41,6 +41,10 @@ if(SHARE_LEN EQUAL 0) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") endif() +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp" "#define ARMA_AUX_LIBS ${CURRENT_INSTALLED_DIR}/lib/openblas.lib;${CURRENT_INSTALLED_DIR}/lib/lapack.lib;${CURRENT_INSTALLED_DIR}/lib/openblas.lib" "") +endif() + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 02e934e200..8c7aaaad9b 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 2, + "port-version": 3, "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": [ diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 381c58c27a..ca634e7597 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88bb8282f33e16f2c59856f68ed9934ff26c7e02", + "version": "10.6.2", + "port-version": 3 + }, { "git-tree": "2a7774c182c273a8d6f350a383f4a3bcf01e308e", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index b1b2343e57..95e310a6ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -162,7 +162,7 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 2 + "port-version": 3 }, "arrayfire": { "baseline": "3.8.0",