aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-12 05:21:49 +0200
committerGitHub <noreply@github.com>2021-10-11 20:21:49 -0700
commit69e12e74610c0508d3c656622ced81d71d9995f8 (patch)
treeec7771b2c9a22133bbeb28223571756fd7f5a688
parent75c6d757a3b924d09053f40e56eee2c47cee3257 (diff)
downloadvcpkg-69e12e74610c0508d3c656622ced81d71d9995f8.tar.gz
vcpkg-69e12e74610c0508d3c656622ced81d71d9995f8.zip
[libsvm] Update to 3.25 (#20629)
* Update libsvm to 3.2.5 * Update CI baseline * Fix version * Update git-tree hash Co-authored-by: chausner <chausner@users.noreply.github.com>
-rw-r--r--ports/libsvm/portfile.cmake33
-rw-r--r--ports/libsvm/vcpkg.json13
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libsvm.json5
4 files changed, 34 insertions, 21 deletions
diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake
index a89b838e1..674014c0f 100644
--- a/ports/libsvm/portfile.cmake
+++ b/ports/libsvm/portfile.cmake
@@ -1,42 +1,41 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cjlin1/libsvm
- REF v323
- SHA512 c4abd408acf860c76cfc743e6c65d241fcb18443e741fc0f557f7cf7b4d0913c05f3afc5d49de8a42ff88db6fc7b046d08bcb0a3d2a24ba23e297ed1cfbb9131
+ REF v325
+ SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203
HEAD_REF master
)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- tools SVM_BUILD_TOOLS
+ FEATURES
+ tools SVM_BUILD_TOOLS
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DSVM_BUILD_TOOLS=OFF
OPTIONS_RELEASE
${FEATURE_OPTIONS}
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}")
-if ("tools" IN_LIST FEATURES)
- if (WIN32)
+if("tools" IN_LIST FEATURES)
+ if(WIN32)
vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN)
- else ()
+ else()
vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-train AUTO_CLEAN)
- endif ()
-endif ()
+ endif()
+endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-# Handle copyright
-configure_file(${SOURCE_PATH}/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json
index fe2003e4d..d99a9112d 100644
--- a/ports/libsvm/vcpkg.json
+++ b/ports/libsvm/vcpkg.json
@@ -1,9 +1,18 @@
{
"name": "libsvm",
- "version-string": "323",
- "port-version": 2,
+ "version": "3.25",
"description": "A library for Support Vector Machines.",
"homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ],
"features": {
"tools": {
"description": "build libsvm CLI tools."
diff --git a/versions/baseline.json b/versions/baseline.json
index 9852d4058..7b75de895 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3837,8 +3837,8 @@
"port-version": 1
},
"libsvm": {
- "baseline": "323",
- "port-version": 2
+ "baseline": "3.25",
+ "port-version": 0
},
"libtasn1": {
"baseline": "4.17.0",
diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json
index 8f919ee33..aba9aa6c2 100644
--- a/versions/l-/libsvm.json
+++ b/versions/l-/libsvm.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a5bcb4cdaf7906a6e12948dcb5b170f79fba900e",
+ "version": "3.25",
+ "port-version": 0
+ },
+ {
"git-tree": "14f75f50d38f27beddb27fb54bf0927942db9954",
"version-string": "323",
"port-version": 2