From f0870ce368f5940bdad2b9818115dc969e140100 Mon Sep 17 00:00:00 2001 From: Tobias Hermann Date: Wed, 30 Nov 2022 18:36:10 +0100 Subject: [PATCH] [frugally-deep] Update to version 0.15.19-p0 (#28043) * Update frugally-deep to version 0.15.19-p0 * Apply x-add-version * Fix the deprecated function in portfile.cmake * Add license MIT in vcpkg.json * Add newline at end of file * Re-add vcpkg_from_github * Update portfile.cmake * Update frugally-deep.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/frugally-deep/portfile.cmake | 15 +++++++-------- ports/frugally-deep/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/f-/frugally-deep.json | 5 +++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/frugally-deep/portfile.cmake b/ports/frugally-deep/portfile.cmake index 1350a728cf..883883f4e6 100644 --- a/ports/frugally-deep/portfile.cmake +++ b/ports/frugally-deep/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/frugally-deep - REF v0.15.10-p0 - SHA512 e665df59c83fea5fc0a89158639c83f9c72cba1fc8c61086032db60c395606dab4e9085f1380714e4f8a82c1f2b143aa22ff6212d9180c368283e1965e6dea87 + REF v0.15.19-p0 + SHA512 3721ab90fcae975497346c459ad5c75b7a39fc43caddd0251119888834e6ebcfa75048a4f95104c874f5397e0320e97c345f1ae8d6a730c4dc8e5429f8f46a49 HEAD_REF master ) @@ -11,18 +11,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS double FDEEP_USE_DOUBLE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFDEEP_BUILD_UNITTEST=OFF -DFDEEP_USE_TOOLCHAIN=ON ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/frugally-deep TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/frugally-deep) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/frugally-deep/vcpkg.json b/ports/frugally-deep/vcpkg.json index 8dfe3eca9a..e41b9ad6a9 100644 --- a/ports/frugally-deep/vcpkg.json +++ b/ports/frugally-deep/vcpkg.json @@ -1,12 +1,21 @@ { "name": "frugally-deep", - "version-semver": "0.15.10-p0", + "version-semver": "0.15.19-p0", "description": "Header-only library for using Keras models in C++.", "homepage": "https://github.com/Dobiasd/frugally-deep", + "license": "MIT", "dependencies": [ "eigen3", "fplus", - "nlohmann-json" + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "double": { diff --git a/versions/baseline.json b/versions/baseline.json index 5b2b428a7c..b631271154 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2473,7 +2473,7 @@ "port-version": 0 }, "frugally-deep": { - "baseline": "0.15.10-p0", + "baseline": "0.15.19-p0", "port-version": 0 }, "fruit": { diff --git a/versions/f-/frugally-deep.json b/versions/f-/frugally-deep.json index 7f4eff05f4..25d93e7aab 100644 --- a/versions/f-/frugally-deep.json +++ b/versions/f-/frugally-deep.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3100096175d535c2c9bc09e3d2195f5729203bc", + "version-semver": "0.15.19-p0", + "port-version": 0 + }, { "git-tree": "360c45aa18328060b37ba37ac541fef843d07e29", "version-semver": "0.15.10-p0",