diff options
| author | pradeep <pradeep.garigipati@gmail.com> | 2021-07-29 00:36:21 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:06:21 -0700 |
| commit | 0dd96bb467f90090769df41d11ceec549e2daf78 (patch) | |
| tree | e19f7235e2959fee7150ce59cfdc5426d8aa1a46 | |
| parent | 1257354a3ab0bebd8abe95281ca561537853578c (diff) | |
| download | vcpkg-0dd96bb467f90090769df41d11ceec549e2daf78.tar.gz vcpkg-0dd96bb467f90090769df41d11ceec549e2daf78.zip | |
[forge] port release update to v1.0.8 (#19166)
* Update forge port to v1.0.8 fix release
* Update baseline version for forge port
| -rw-r--r-- | ports/forge/cmake_config.patch | 36 | ||||
| -rw-r--r-- | ports/forge/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/forge/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/forge.json | 5 |
5 files changed, 11 insertions, 38 deletions
diff --git a/ports/forge/cmake_config.patch b/ports/forge/cmake_config.patch index eb77265a0..4775ec0d1 100644 --- a/ports/forge/cmake_config.patch +++ b/ports/forge/cmake_config.patch @@ -1,40 +1,8 @@ diff --git a/CMakeModules/ForgeConfig.cmake.in b/CMakeModules/ForgeConfig.cmake.in -index e4c7737..5a3b000 100644 +index 6fb18ac..5a3b000 100644 --- a/CMakeModules/ForgeConfig.cmake.in +++ b/CMakeModules/ForgeConfig.cmake.in -@@ -57,16 +57,24 @@ if (NOT TARGET Forge::forge AND - endif () - - if (TARGET Forge::forge) -- get_property(config TARGET Forge::forge PROPERTY IMPORTED_CONFIGURATIONS) -- if(NOT config) -- set(config "NOCONFIG") -+ get_property(configs TARGET Forge::forge PROPERTY IMPORTED_CONFIGURATIONS) -+ if(NOT configs) -+ set(configs "NOCONFIG") - endif() -- get_property(loc TARGET Forge::forge PROPERTY IMPORTED_LOCATION_${config}) -+ foreach(config IN LISTS configs) -+ get_property(loc TARGET Forge::forge PROPERTY IMPORTED_LOCATION_${config}) -+ -+ # break if any of the imported configurations exist. All configs write to the same -+ # location so they are not working as CMake intended. Its fine for single config -+ # installers like ours. -+ if(EXISTS ${loc}) -+ set(Forge_BINARY_EXISTS TRUE) -+ break() -+ endif() -+ endforeach() - endif () - --if ((TARGET Forge::forge AND EXISTS ${loc}) -- OR -- TARGET forge) -+if ((TARGET Forge::forge AND Forge_BINARY_EXISTS) OR TARGET forge) - set(Forge_FOUND ON) - if (TARGET forge AND NOT TARGET Forge::forge) - add_library(Forge::forge ALIAS forge) -@@ -75,3 +83,22 @@ if ((TARGET Forge::forge AND EXISTS ${loc}) +@@ -83,3 +83,22 @@ if ((TARGET Forge::forge AND Forge_BINARY_EXISTS) OR TARGET forge) else () set(Forge_FOUND OFF) endif () diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake index bdbd5ee80..956de3d37 100644 --- a/ports/forge/portfile.cmake +++ b/ports/forge/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arrayfire/forge
- REF v1.0.7
- SHA512 d341d5c6bdccf7d2f085162d1d8209b0b28d73b8a9f3173546b26f06bf8e422b3fdf1cfbaa7d122ea75cee5cf5f6bb6dbd2bffc10d8e0c336b5b8695c39f7b54
+ REF v1.0.8
+ SHA512 08e5eb89d80f7fa3310f0eb37481492b5c1dfff00b33c308169862d8b25cf93ad1d9c0db78667c0207a7f6f8ca4046c196bd3a987af839ea1864b49c738ee8e3
HEAD_REF master
PATCHES cmake_config.patch
)
diff --git a/ports/forge/vcpkg.json b/ports/forge/vcpkg.json index 52d62400b..afd8df8d3 100644 --- a/ports/forge/vcpkg.json +++ b/ports/forge/vcpkg.json @@ -1,6 +1,6 @@ { "name": "forge", - "version-semver": "1.0.7", + "version-semver": "1.0.8", "description": "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.", "homepage": "https://github.com/arrayfire/forge", "supports": "x64", diff --git a/versions/baseline.json b/versions/baseline.json index a5bfbc3b0..73dffedbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2093,7 +2093,7 @@ "port-version": 0 }, "forge": { - "baseline": "1.0.7", + "baseline": "1.0.8", "port-version": 0 }, "fp16": { diff --git a/versions/f-/forge.json b/versions/f-/forge.json index a74daa624..dc16eafae 100644 --- a/versions/f-/forge.json +++ b/versions/f-/forge.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d67247c4d974ea6d75d0918865db0c7842a5ec66", + "version-semver": "1.0.8", + "port-version": 0 + }, + { "git-tree": "ca5513200ad2efb90936120fdfc7ea8bb6730f9d", "version-semver": "1.0.7", "port-version": 0 |
