[mlpack] Fix supports (#21316)

* [mlpack] fix supports

* Update ports/mlpack/portfile.cmake

* fix typo

* version

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
NancyLi1013 2021-12-11 05:51:15 +08:00 committed by GitHub
parent 5c54cc0655
commit 36c0baf755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 21 deletions

View File

@ -11,16 +11,16 @@ vcpkg_from_github(
fix-dependencies.patch
)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake)
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACML.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindACMLMP.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindARPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindCLAPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindLAPACK.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindMKL.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake")
file(REMOVE "${SOURCE_PATH}/CMake/FindArmadillo.cmake")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
@ -28,9 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
openmp USE_OPENMP
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTS=OFF
-DDOWNLOAD_STB_IMAGE=OFF
@ -39,9 +39,9 @@ vcpkg_configure_cmake(
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mlpack)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mlpack)
vcpkg_copy_pdbs()
@ -99,6 +99,6 @@ if("tools" IN_LIST FEATURES)
)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,10 +1,10 @@
{
"name": "mlpack",
"version": "3.4.1",
"port-version": 2,
"port-version": 3,
"description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.",
"homepage": "https://github.com/mlpack/mlpack",
"supports": "uwp",
"supports": "!uwp",
"dependencies": [
"armadillo",
"boost-heap",
@ -14,7 +14,15 @@
"boost-serialization",
"boost-serialization",
"ensmallen",
"stb"
"stb",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"openmp": {

View File

@ -4430,7 +4430,7 @@
},
"mlpack": {
"baseline": "3.4.1",
"port-version": 2
"port-version": 3
},
"mman": {
"baseline": "git-f5ff813",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa79e1e52ba4e3112b84d77bc321580988b945f0",
"version": "3.4.1",
"port-version": 3
},
{
"git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001",
"version": "3.4.1",