diff --git a/ports/type-safe/disable_tests.patch b/ports/type-safe/disable_tests.patch deleted file mode 100644 index f18d2ebbfa..0000000000 --- a/ports/type-safe/disable_tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -136,7 +136,7 @@ - # other subdirectories - # only add if not inside add_subdirectory() - option(TYPE_SAFE_BUILD_TEST_EXAMPLE "build test and example" OFF) --if(${TYPE_SAFE_BUILD_TEST_EXAMPLE} OR (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)) -+if(${TYPE_SAFE_BUILD_TEST_EXAMPLE}) - enable_testing() - add_subdirectory(example/) - add_subdirectory(test/) diff --git a/ports/type-safe/portfile.cmake b/ports/type-safe/portfile.cmake index 8930f3f924..025cc3973d 100644 --- a/ports/type-safe/portfile.cmake +++ b/ports/type-safe/portfile.cmake @@ -1,26 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO foonathan/type_safe - REF da1d15abc612afbdc81d70c817b49ba1752177de - SHA512 5b344af89378e34f05d96bff2de61615bc16e21601d9fe9d0886c71db211bd3b42afb2467dd2eb7f3d11176dc9adc2d71c6dc0b60722e12aaf8c1d79ea869289 - HEAD_REF v0.2.1 - PATCHES - disable_tests.patch + REF v0.2.2 + SHA512 5dbc9e906e066cfc5eb8fd9a308e952e33c7463b5d2abaadd4303ebe8c38a1d8e79865076ad6422f4c56ffa23113b291e3c11d6dd28e73ec3d6fe2e3e7a233a3 + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTYPE_SAFE_BUILD_TEST_EXAMPLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/type_safe TARGET_PATH share/type_safe) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/type_safe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/type-safe/vcpkg.json b/ports/type-safe/vcpkg.json index 3b16d3c7b1..175055c131 100644 --- a/ports/type-safe/vcpkg.json +++ b/ports/type-safe/vcpkg.json @@ -1,9 +1,17 @@ { "name": "type-safe", - "version-string": "0.2.1", + "version": "0.2.2", "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.", "homepage": "https://github.com/foonathan/type_safe", "dependencies": [ - "debug-assert" + "debug-assert", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index e5c2deeed9..563a0bf6e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6805,7 +6805,7 @@ "port-version": 1 }, "type-safe": { - "baseline": "0.2.1", + "baseline": "0.2.2", "port-version": 0 }, "uchardet": { diff --git a/versions/t-/type-safe.json b/versions/t-/type-safe.json index 086a78c3a4..56d1b80035 100644 --- a/versions/t-/type-safe.json +++ b/versions/t-/type-safe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c46af3efa54c55f23076777fb7c276886f1dd1ce", + "version": "0.2.2", + "port-version": 0 + }, { "git-tree": "b8a081a46706947bbef195669f57707aa2a9d393", "version-string": "0.2.1",