[forge] port release update to v1.0.8 (#19166)

* Update forge port to v1.0.8 fix release

* Update baseline version for forge port
This commit is contained in:
pradeep 2021-07-29 00:36:21 +05:30 committed by GitHub
parent 1257354a3a
commit 0dd96bb467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 38 deletions

View File

@ -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 ()

View File

@ -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
)

View File

@ -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",

View File

@ -2093,7 +2093,7 @@
"port-version": 0
},
"forge": {
"baseline": "1.0.7",
"baseline": "1.0.8",
"port-version": 0
},
"fp16": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d67247c4d974ea6d75d0918865db0c7842a5ec66",
"version-semver": "1.0.8",
"port-version": 0
},
{
"git-tree": "ca5513200ad2efb90936120fdfc7ea8bb6730f9d",
"version-semver": "1.0.7",