Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg scripts] Fix check the different features have the same feature variable in function vcpkg_check_features (#31984)

Browse Source
This commit is contained in:
JonLiu1993
2023-07-21 09:04:10 -07:00
committed by GitHub
parent f41244d1b4
commit a564a7e2a5
11 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ports/libsbml/portfile.cmake
View File

@@ -21,7 +21,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
multi ENABLE_MULTI
qual ENABLE_QUAL
render ENABLE_RENDER
render ENABLE_LAYOUT
bzip2 WITH_BZIP2
zlib WITH_ZLIB
test WITH_CHECK

10
ports/libsbml/vcpkg.json
View File

@@ -65,7 +65,15 @@
"description": "support for Qualitative Modeling"
},
"render": {
"description": "support for Rendering information"
"description": "support for Rendering information",
"dependencies": [
{
"name": "libsbml",
"features": [
"layout"
]
}
]
},
"test": {
"description": "Unit testing of libSBMLs implementation",

7
ports/mnn/portfile.cmake
View File

@@ -17,19 +17,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
test MNN_BUILD_TEST
test MNN_BUILD_BENCHMARK
cuda MNN_CUDA
cuda MNN_GPU_TRACE
vulkan MNN_VULKAN
vulkan MNN_GPU_TRACE
vulkan MNN_USE_SYSTEM_LIB
opencl MNN_OPENCL
opencl MNN_USE_SYSTEM_LIB
metal MNN_METAL
metal MNN_GPU_TRACE
tools MNN_BUILD_TOOLS
tools MNN_BUILD_QUANTOOLS
tools MNN_BUILD_TRAIN
tools MNN_EVALUATION
tools MNN_BUILD_CONVERTER
gpu MNN_GPU_TRACE
system MNN_USE_SYSTEM_LIB
)
# 'cuda' feature in Windows failes with Ninja because of parallel PDB access. Make it optional

39
ports/mnn/vcpkg.json
View File

@@ -1,7 +1,7 @@
{
"name": "mnn",
"version": "1.1.0",
"port-version": 4,
"port-version": 5,
"description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba",
"homepage": "https://www.mnn.zone/",
"license": "Apache-2.0",
@@ -24,18 +24,44 @@
"description": "Enable CUDA API backend",
"dependencies": [
"cuda",
"cudnn"
"cudnn",
{
"name": "mnn",
"features": [
"gpu"
]
}
]
},
"gpu": {
"description": "Enable MNN Gpu Debug"
},
"metal": {
"description": "Enable Metal API backend for Apple platforms"
"description": "Enable Metal API backend for Apple platforms",
"dependencies": [
{
"name": "mnn",
"features": [
"gpu"
]
}
]
},
"opencl": {
"description": "Enable OpenCL API backend",
"dependencies": [
{
"name": "mnn",
"features": [
"system"
]
},
"opencl"
]
},
"system": {
"description": "For opencl and vulkan, use system lib or use dlopen"
},
"test": {
"description": "Build MNN test programs"
},
@@ -48,6 +74,13 @@
"vulkan": {
"description": "Enable Vulkan API backend",
"dependencies": [
{
"name": "mnn",
"features": [
"gpu",
"system"
]
},
"vulkan"
]
}

7
ports/ogre/portfile.cmake
View File

@@ -39,14 +39,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
freeimage OGRE_BUILD_PLUGIN_FREEIMAGE
freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage
java OGRE_BUILD_COMPONENT_JAVA
java CMAKE_REQUIRE_FIND_PACKAGE_SWIG
openexr OGRE_BUILD_PLUGIN_EXRCODEC
openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR
python OGRE_BUILD_COMPONENT_PYTHON
python CMAKE_REQUIRE_FIND_PACKAGE_Python3
python CMAKE_REQUIRE_FIND_PACKAGE_SWIG
csharp OGRE_BUILD_COMPONENT_CSHARP
csharp CMAKE_REQUIRE_FIND_PACKAGE_SWIG
overlay OGRE_BUILD_COMPONENT_OVERLAY
overlay CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE
zip OGRE_CONFIG_ENABLE_ZIP
@@ -55,6 +52,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
tools OGRE_INSTALL_TOOLS
)
if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_SWIG=ON")
endif()
if(CMAKE_REQUIRE_FIND_PACKAGE_SWIG)
vcpkg_find_acquire_program(SWIG)
vcpkg_list(APPEND FEATURE_OPTIONS "-DSWIG_EXECUTABLE=${SWIG}")

2
ports/ogre/vcpkg.json
View File

@@ -1,7 +1,7 @@
{
"name": "ogre",
"version": "13.6.2",
"port-version": 2,
"port-version": 3,
"description": "3D Object-Oriented Graphics Rendering Engine",
"homepage": "https://github.com/OGRECave/ogre",
"license": "MIT",

3
scripts/cmake/vcpkg_check_features.cmake
View File

@@ -87,8 +87,9 @@ function(vcpkg_check_features)
set(last_variable)
foreach(variable IN LISTS feature_variables)
if(variable STREQUAL last_variable)
message(FATAL_ERROR "vcpkg_check_features passed the same feature variable multiple times: '${variable}'")
message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_check_features passed the same feature variable multiple times: '${variable}'")
endif()
set(last_variable ${variable})
endforeach()
set("${arg_OUT_FEATURE_OPTIONS}" "${feature_options}" PARENT_SCOPE)

4
versions/baseline.json
View File

@@ -5386,7 +5386,7 @@
},
"mnn": {
"baseline": "1.1.0",
"port-version": 4
"port-version": 5
},
"modp-base64": {
"baseline": "2020-09-26",
@@ -5866,7 +5866,7 @@
},
"ogre": {
"baseline": "13.6.2",
"port-version": 2
"port-version": 3
},
"ogre-next": {
"baseline": "2.3.1",

2
versions/l-/libsbml.json
View File

@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "c6b4494941ba4df373899108eaab63d59387c875",
"git-tree": "9d718a41ed85525971eb0cc46dbb31e91673c576",
"version": "5.20.0",
"port-version": 1
},

5
versions/m-/mnn.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4f755e0b91f277b483ce9b157d7e10fb99b49878",
"version": "1.1.0",
"port-version": 5
},
{
"git-tree": "e0bd733035bf0f532457f0d03b2aed538afe5cc1",
"version": "1.1.0",

5
versions/o-/ogre.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c8e30fd12c47569a6d5eb430db1393a1a5143686",
"version": "13.6.2",
"port-version": 3
},
{
"git-tree": "9a0701fa116eca04bd8a2446f6e44c732084857b",
"version": "13.6.2",