aboutsummaryrefslogtreecommitdiff
path: root/ports/magnum
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2021-01-27 00:03:54 +0100
committerGitHub <noreply@github.com>2021-01-26 15:03:54 -0800
commit795588570aa5fb2d4f33a13648b8b602e9d4a52c (patch)
treec32a1727b37ecd64460694ec2ef84a89813156d8 /ports/magnum
parente72302d44237c751bcf3db8a4d5922d34d45f68f (diff)
downloadvcpkg-795588570aa5fb2d4f33a13648b8b602e9d4a52c.tar.gz
vcpkg-795588570aa5fb2d4f33a13648b8b602e9d4a52c.zip
[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163)
* [magnum,magnum-plugins] Add vulkan and shaderconverter features Signed-off-by: Squareys <squareys@googlemail.com> * [magnum,-plugins] Add warning for features unavailable in non-head version Signed-off-by: Squareys <squareys@googlemail.com> * update version record Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'ports/magnum')
-rw-r--r--ports/magnum/CONTROL24
-rw-r--r--ports/magnum/portfile.cmake12
2 files changed, 34 insertions, 2 deletions
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index e7fa5bd9a..5c9c8fa1c 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,10 +1,10 @@
Source: magnum
Version: 2020.06
-Port-Version: 2
+Port-Version: 3
Build-Depends: corrade[utility]
Description: C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
-Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application
+Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, anyshaderconverter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shadertools, text, texturetools, trade, sdl2application
Feature: al-info
Description: magnum-al-info utility
@@ -30,6 +30,10 @@ Feature: anysceneimporter
Description: AnySceneImporter plugin
Build-Depends: magnum[core,trade]
+Feature: anyshaderconverter
+Description: AnyShaderConverter plugin
+Build-Depends: magnum[core,shadertools]
+
Feature: audio
Description: Audio library
Build-Depends: openal-soft
@@ -99,6 +103,10 @@ Feature: sceneconverter
Description: magnum-sceneconverter utility
Build-Depends: magnum[core,anysceneconverter]
+Feature: shaderconverter
+Description: magnum-shaderconverter utility
+Build-Depends: magnum[core,shadertools,anyshaderconverter]
+
Feature: shaders
Description: Shaders library
Build-Depends: magnum[core,gl]
@@ -153,3 +161,15 @@ Build-Depends: magnum[core,gl]
Feature: glxcontext
Description: GlxContext library
Build-Depends: magnum[core,gl]
+
+Feature: shadertools
+Description: ShaderTools library
+
+Feature: vk
+Description: Vk library
+Build-Depends: vulkan
+
+Feature: vk-info
+Description: vk-info utility
+Build-Depends: magnum[core,vk]
+
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index cb8b2473c..3aa777c9b 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -49,6 +49,13 @@ if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)")
list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication)
endif()
+# Head only features
+if(NOT VCPKG_USE_HEAD_VERSION)
+ list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter
+ vk-info)
+ message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.")
+endif()
+
set(_COMPONENTS "")
# Generate cmake parameters from feature names
foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES)
@@ -88,6 +95,11 @@ set(_TOOLS
gl-info
imageconverter
sceneconverter)
+if(VCPKG_USE_HEAD_VERSION)
+list(APPEND _TOOLS
+ shaderconverter
+ vk-info)
+endif()
foreach(_tool IN LISTS _TOOLS)
if("${_tool}" IN_LIST FEATURES)
list(APPEND _TOOL_EXEC_NAMES magnum-${_tool})