diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-09-14 11:17:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 20:17:25 -0700 |
| commit | 18860a0e4860f2dc77b4d7af83b94ea14b8ee48d (patch) | |
| tree | 955eaf8f3428af63f5f8a9ed9ba44e35f6becf87 | |
| parent | c592209c5f4d537b866548b1f2cb13e296b5dfc6 (diff) | |
| download | vcpkg-18860a0e4860f2dc77b4d7af83b94ea14b8ee48d.tar.gz vcpkg-18860a0e4860f2dc77b4d7af83b94ea14b8ee48d.zip | |
[armadillo]update to 10.6.2 (#19648)
* [armadillo]update to 10.6.2
* update version
* update portifile.cmake
* update version
| -rw-r--r-- | ports/armadillo/portfile.cmake | 33 | ||||
| -rw-r--r-- | ports/armadillo/vcpkg.json | 12 | ||||
| -rw-r--r-- | versions/a-/armadillo.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
4 files changed, 31 insertions, 21 deletions
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 4f52e9d74..757065f60 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -3,46 +3,43 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.4.0.tar.xz" - SHA512 72cf8a493e86c51c4c875076d0a9dd7c21fbfbd639064fa7a96daf4a5df02b36c93440bbae471f30d368547c6856c91fef97ce8ed2ec0526b0060588b71cd28a + FILENAME "armadillo-10.6.2.tar.xz" + SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba PATCHES remove_custom_modules.patch fix-CMakePath.patch add-disable-find-package.patch ) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake) +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DDETECT_HDF5=false -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ACML=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ACMLMP=ON -DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON -DCMAKE_DISABLE_FIND_PACKAGE_ATLAS=ON -DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/Armadillo) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/Armadillo/CMake) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(GLOB SHARE_CONTENT ${CURRENT_PACKAGES_DIR}/share/Armadillo) +file(GLOB SHARE_CONTENT "${CURRENT_PACKAGES_DIR}/share/Armadillo") list(LENGTH SHARE_CONTENT SHARE_LEN) if(SHARE_LEN EQUAL 0) # On case sensitive file system there is an extra empty directory created that should be removed - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") 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) +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 19daff809..bf9db01cb 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,10 +1,18 @@ { "name": "armadillo", - "version": "10.4.0", + "version": "10.6.2", "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" + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 036696041..54a94c6a8 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "66b31fe832e9322876f427f1fec7836bb71c082c", + "version": "10.6.2", + "port-version": 0 + }, + { "git-tree": "3925824cd7eed2d9fcaa092a9a543eb538d9a558", "version": "10.4.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index 6558eecb5..e313e7af8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -157,7 +157,7 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.4.0", + "baseline": "10.6.2", "port-version": 0 }, "arrayfire": { |