diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index abc372c547..30030dcd8e 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -41,8 +41,11 @@ 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" "") +set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp") +if(EXISTS "${filename}") + file(READ "${filename}" contents) + string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\\n]*\n" "\n" contents "${contents}") + file(WRITE "${filename}" "${contents}") endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 8c7aaaad9b..7cceca2189 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 3, + "port-version": 4, "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 ca634e7597..51a586f56e 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddc4477e6ecc2d66e429e18e9ccd96367da2ce88", + "version": "10.6.2", + "port-version": 4 + }, { "git-tree": "88bb8282f33e16f2c59856f68ed9934ff26c7e02", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index c379020ef8..d5620892d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -162,7 +162,7 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 3 + "port-version": 4 }, "arrayfire": { "baseline": "3.8.0",