From b7cff0d6f4aea4023e9f400726c5629a9032bf4a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 15 Oct 2021 00:03:14 +0200 Subject: [hfsm2] Update to 1.10.1 (#20729) * Update hfsm2 to 1.10.1 * Update CI baseline * Fix include path * Update git-tree hash Co-authored-by: chausner --- ports/hfsm2/portfile.cmake | 11 +++++++---- ports/hfsm2/usage | 4 ++++ ports/hfsm2/vcpkg.json | 8 ++------ versions/baseline.json | 4 ++-- versions/h-/hfsm2.json | 5 +++++ 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 ports/hfsm2/usage diff --git a/ports/hfsm2/portfile.cmake b/ports/hfsm2/portfile.cmake index 48275078b..09e71e139 100644 --- a/ports/hfsm2/portfile.cmake +++ b/ports/hfsm2/portfile.cmake @@ -1,13 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrew-gresyk/HFSM2 - REF Beta7 - SHA512 f3365c0823fa63f7e6b82bd2dc84f8871eb58ffd9485753a60ea8f956856cbec7c5da3929ab8fe8b5902a7c840334a1d421417984124adf109f96756490ac437 + REF 1_10_1 + SHA512 49ae09a3e4052c7a70390510d128d4d0a41f3c2b6bb9cf2c0b36d272ca1a2524c1d2b544e4c36655681255ce6a5e2f3f90f8c4e9957e8c49e49a62927134a718 HEAD_REF master ) # Install include directory -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy usage file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/hfsm2/usage b/ports/hfsm2/usage new file mode 100644 index 000000000..9c7b99766 --- /dev/null +++ b/ports/hfsm2/usage @@ -0,0 +1,4 @@ +The package hfsm2 is header only and can be used from CMake via: + + find_path(HFSM2_INCLUDE_DIRS "hfsm2/machine.hpp") + target_include_directories(main PRIVATE ${HFSM2_INCLUDE_DIRS}) diff --git a/ports/hfsm2/vcpkg.json b/ports/hfsm2/vcpkg.json index 6486dfaa5..78e243c50 100644 --- a/ports/hfsm2/vcpkg.json +++ b/ports/hfsm2/vcpkg.json @@ -1,10 +1,6 @@ { "name": "hfsm2", - "version-string": "beta7", - "port-version": 1, + "version": "1.10.1", "description": "Header-only heriarchical FSM framework in C++14, with fully statically-defined structure (no dynamic allocations), built with variadic templates.", - "homepage": "https://github.com/andrew-gresyk/HFSM2", - "dependencies": [ - "catch2" - ] + "homepage": "https://github.com/andrew-gresyk/HFSM2" } diff --git a/versions/baseline.json b/versions/baseline.json index 48ed54798..b74e96025 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,8 +2641,8 @@ "port-version": 1 }, "hfsm2": { - "baseline": "beta7", - "port-version": 1 + "baseline": "1.10.1", + "port-version": 0 }, "hidapi": { "baseline": "0.11.0", diff --git a/versions/h-/hfsm2.json b/versions/h-/hfsm2.json index 34bd88354..84c8672c3 100644 --- a/versions/h-/hfsm2.json +++ b/versions/h-/hfsm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5f096dede4a8567200188df695cdbf2cb19c6d5", + "version": "1.10.1", + "port-version": 0 + }, { "git-tree": "278f7b5b00418376ce4e8777cd5fddb927ec3686", "version-string": "beta7", -- cgit v1.2.3