diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-29 23:08:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 08:08:10 -0700 |
| commit | d329368fd4eac33c3e7127c5a76e084211392ac3 (patch) | |
| tree | 28457d827053ecb268f91a9dfc58bfe870183cdf | |
| parent | c6f863b236397620ced8d557eebd8b28d4413c3c (diff) | |
| download | vcpkg-d329368fd4eac33c3e7127c5a76e084211392ac3.tar.gz vcpkg-d329368fd4eac33c3e7127c5a76e084211392ac3.zip | |
[forge] Fix usage (#17404)
* [forge] Fix usage
* update version record
| -rw-r--r-- | ports/forge/CONTROL | 5 | ||||
| -rw-r--r-- | ports/forge/fix-usage.patch | 29 | ||||
| -rw-r--r-- | ports/forge/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/forge/vcpkg.json | 20 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/forge.json | 5 |
6 files changed, 58 insertions, 7 deletions
diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL deleted file mode 100644 index 659204964..000000000 --- a/ports/forge/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: forge
-Version: 1.0.5 -Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
-Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
-Supports: x64
\ No newline at end of file diff --git a/ports/forge/fix-usage.patch b/ports/forge/fix-usage.patch new file mode 100644 index 000000000..5ce05e249 --- /dev/null +++ b/ports/forge/fix-usage.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeModules/ForgeConfig.cmake.in b/CMakeModules/ForgeConfig.cmake.in +index e4c7737..6429069 100644 +--- a/CMakeModules/ForgeConfig.cmake.in ++++ b/CMakeModules/ForgeConfig.cmake.in +@@ -52,16 +52,18 @@ set(Forge_FOUND OFF) + + if (NOT TARGET Forge::forge AND + NOT TARGET forge AND +- EXISTS @PACKAGE_CMAKE_DIR@/ForgeTargets.cmake) +- include(@PACKAGE_CMAKE_DIR@/ForgeTargets.cmake) ++ EXISTS ${CMAKE_CURRENT_LIST_DIR}/ForgeTargets.cmake) ++ include(${CMAKE_CURRENT_LIST_DIR}/ForgeTargets.cmake) + 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 ${configs}) ++ get_property(loc TARGET Forge::forge PROPERTY IMPORTED_LOCATION_${config}) ++ endforeach() + endif () + + if ((TARGET Forge::forge AND EXISTS ${loc}) diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake index 64697d84e..1c3923e35 100644 --- a/ports/forge/portfile.cmake +++ b/ports/forge/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 1a0f0cb6371a8c8053ab5eb7cbe3039c95132389 # v1.0.5 SHA512 8f8607421880a0f0013380eb5efb3a4f05331cd415d68c9cd84dd57eb727da1df6223fc6d65b106675d6aa09c3388359fab64443c31fadadf7641161be6b3b89
HEAD_REF master
- PATCHES fix-static_build.patch
+ PATCHES
+ fix-static_build.patch
+ fix-usage.patch
)
vcpkg_configure_cmake(
diff --git a/ports/forge/vcpkg.json b/ports/forge/vcpkg.json new file mode 100644 index 000000000..05d7a3a13 --- /dev/null +++ b/ports/forge/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "forge", + "version-semver": "1.0.5", + "port-version": 1, + "description": "Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.", + "homepage": "https://github.com/arrayfire/forge", + "supports": "x64", + "dependencies": [ + "boost-functional", + { + "name": "fontconfig", + "platform": "!windows" + }, + "freeimage", + "freetype", + "glbinding", + "glfw3", + "glm" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 44cbfdc86..6c398be5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2046,7 +2046,7 @@ }, "forge": { "baseline": "1.0.5", - "port-version": 0 + "port-version": 1 }, "fp16": { "baseline": "2021-02-21", diff --git a/versions/f-/forge.json b/versions/f-/forge.json index d62499285..9f302b28b 100644 --- a/versions/f-/forge.json +++ b/versions/f-/forge.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b160185b8e2d1f0bd2268cb56d73e0e6a2940f69", + "version-semver": "1.0.5", + "port-version": 1 + }, + { "git-tree": "29625ec4b111b2a3925f77222d9aa600229c8d96", "version-string": "1.0.5", "port-version": 0 |