diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index 39f311e136f..94ff5e24c70 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/double-conversion - REF 9e0c13564e17362aad8a32c1344a2214f71952c6 #v3.2.0 - SHA512 4579ae02196a2722cbce2888a404d026d62523256aa5f726c4b46aa25aa76d3caaf653848afb88939aac697049afc8968ddecda8a093520b392c9f963559a992 + REF af09fd65fcf24eee95dc62813ba9123414635428 #v3.2.1 + SHA512 721d736a2d065b8ff6058345afe6990ab568174e202361abc7ce36c16931c05128df4fd5034f98f114a7b01972eda3b98bfc209ef45394d0b5d4bbce8140b28a HEAD_REF master ) diff --git a/ports/double-conversion/vcpkg.json b/ports/double-conversion/vcpkg.json index 604189dedf5..08df1f4129b 100644 --- a/ports/double-conversion/vcpkg.json +++ b/ports/double-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "double-conversion", - "version": "3.2.0", + "version": "3.2.1", "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", "homepage": "https://github.com/google/double-conversion", "dependencies": [ diff --git a/ports/itk/double-conversion.patch b/ports/itk/double-conversion.patch index 636dd8c4c7d..a24b4be3cfd 100644 --- a/ports/itk/double-conversion.patch +++ b/ports/itk/double-conversion.patch @@ -2,13 +2,19 @@ diff --git a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt b/Modules/ThirdP index 16c611fd3..13978724c 100644 --- a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt +++ b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt -@@ -9,7 +9,10 @@ mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION) +@@ -9,7 +9,16 @@ mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION) if(ITK_USE_SYSTEM_DOUBLECONVERSION) find_package(double-conversion REQUIRED) get_target_property(ITKDoubleConversion_INCLUDE_DIRS double-conversion::double-conversion INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ITKDoubleConversion_LIBRARIES double-conversion::double-conversion LOCATION) -+ get_target_property(ITKDoubleConversion_LIBRARY_RELEASE double-conversion::double-conversion LOCATION_RELEASE) -+ get_target_property(ITKDoubleConversion_LIBRARY_DEBUG double-conversion::double-conversion LOCATION_DEBUG) ++ get_target_property(ITKDoubleConversion_LIBRARY_RELEASE double-conversion::double-conversion IMPORTED_IMPLIB_RELEASE) ++ if(NOT ITKDoubleConversion_LIBRARY_RELEASE) ++ get_target_property(ITKDoubleConversion_LIBRARY_RELEASE double-conversion::double-conversion IMPORTED_LOCATION_RELEASE) ++ endif() ++ get_target_property(ITKDoubleConversion_LIBRARY_DEBUG double-conversion::double-conversion IMPORTED_IMPLIB_DEBUG) ++ if(NOT ITKDoubleConversion_LIBRARY_DEBUG) ++ get_target_property(ITKDoubleConversion_LIBRARY_DEBUG double-conversion::double-conversion IMPORTED_LOCATION_DEBUG) ++ endif() + include(SelectLibraryConfigurations) + select_library_configurations(ITKDoubleConversion) else() diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 569432d614a..d6fdd6a90d8 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version": "5.2.1", - "port-version": 2, + "port-version": 3, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4f853e9552d..585a1d20a70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2001,7 +2001,7 @@ "port-version": 0 }, "double-conversion": { - "baseline": "3.2.0", + "baseline": "3.2.1", "port-version": 0 }, "dpdk": { @@ -3154,7 +3154,7 @@ }, "itk": { "baseline": "5.2.1", - "port-version": 2 + "port-version": 3 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/d-/double-conversion.json b/versions/d-/double-conversion.json index 133306d2c51..e6a5ccb2c1d 100644 --- a/versions/d-/double-conversion.json +++ b/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16b23d889f831b492aaa819cfde4d5d263be5bed", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "b85d7877f614063165639f251200a65e8d5c9ba5", "version": "3.2.0", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index 76bb7db4908..ecc09cae812 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3904d4a80201635e6687ff2b5ca5d677b559874", + "version": "5.2.1", + "port-version": 3 + }, { "git-tree": "e22b353e8f00bcdc12b78d414a712a3498a2d0d6", "version": "5.2.1",