From 77cb26919d240fd3cc8c6f008207f76b80716a68 Mon Sep 17 00:00:00 2001 From: Carl Mueller-Roemer Date: Wed, 10 Mar 2021 21:02:20 +0100 Subject: [PATCH] Don't copy svm-toy if not on Windows (#16501) * Don't copy svm-toy if not on Windows svm-toy is only compiled on Windows, so should only be copied on Windows. * Bump port version on libsvm. Switch to new manifest file format. * [libsvm] Format manifest * update version record Co-authored-by: JackBoosY --- ports/libsvm/CONTROL | 7 ------- ports/libsvm/portfile.cmake | 6 +++++- ports/libsvm/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libsvm.json | 5 +++++ 5 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 ports/libsvm/CONTROL create mode 100644 ports/libsvm/vcpkg.json diff --git a/ports/libsvm/CONTROL b/ports/libsvm/CONTROL deleted file mode 100644 index 4a9af6018f4..00000000000 --- a/ports/libsvm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libsvm -Version: 323-1 -Description: A library for Support Vector Machines -Homepage: https://www.csie.ntu.edu.tw/~cjlin/libsvm/ - -Feature: tools -Description: Build libsvm tools diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index fe15e57bf3c..a89b838e1ed 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -29,7 +29,11 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) + if (WIN32) + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) + else () + vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-train AUTO_CLEAN) + endif () endif () file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json new file mode 100644 index 00000000000..fe2003e4d0d --- /dev/null +++ b/ports/libsvm/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libsvm", + "version-string": "323", + "port-version": 2, + "description": "A library for Support Vector Machines.", + "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", + "features": { + "tools": { + "description": "build libsvm CLI tools." + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index f6bf334d08c..a72bc630e14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3445,8 +3445,8 @@ "port-version": 0 }, "libsvm": { - "baseline": "323-1", - "port-version": 0 + "baseline": "323", + "port-version": 2 }, "libtheora": { "baseline": "1.2.0alpha1-20170719", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index d3fe0a9f594..8f919ee33bb 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f75f50d38f27beddb27fb54bf0927942db9954", + "version-string": "323", + "port-version": 2 + }, { "git-tree": "81c8a12b8a8abcbfe0eefa7ea1643ea3118b49a2", "version-string": "323-1",