diff --git a/ports/immer/fix-ExportConfigVersion.patch b/ports/immer/fix-ExportConfigVersion.patch new file mode 100644 index 0000000000..39869fa95a --- /dev/null +++ b/ports/immer/fix-ExportConfigVersion.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8cfbd3..84c89a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,6 +96,14 @@ target_include_directories(immer INTERFACE + $ + $) + install(TARGETS immer EXPORT ImmerConfig) ++ ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake" ++ VERSION ${PROJECT_VERSION} ++ COMPATIBILITY SameMajorVersion ) ++ ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer" ) + install(EXPORT ImmerConfig DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer") + install(DIRECTORY immer DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index ada3cced68..50abde6309 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -1,12 +1,13 @@ # header-only library -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer - REF v${VERSION} + REF "v${VERSION}" SHA512 fc34242d36efdb9faa1f22ccc7591c1ace34c2b383e1266a290346baedc154e3d4a682d6dd5094460b75e123347194710072e996d19165cc5fd23c922fdfc4e8 HEAD_REF master + PATCHES + fix-ExportConfigVersion.patch # Upstream PR https://github.com/arximboldi/immer/pull/250 has been merged, this patch need to be removed in next update. ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index 09c5823eda..742a5e188b 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "immer", "version": "0.8.0", + "port-version": 1, "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index d499140aa4..e4ed65753e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3142,7 +3142,7 @@ }, "immer": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "implot": { "baseline": "0.14", diff --git a/versions/i-/immer.json b/versions/i-/immer.json index b34aa96d33..4874b89253 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e133c376f7ef7d4e7c8b78245b70231e8df5b601", + "version": "0.8.0", + "port-version": 1 + }, { "git-tree": "9e996304abce149829a2d0db1156bcf34c9e51c8", "version": "0.8.0",