Skip to content

Commit 55e2b24

Browse files
committed
split vcpkg dependencies into features
1 parent dd1bd5c commit 55e2b24

File tree

4 files changed

+92
-16
lines changed

4 files changed

+92
-16
lines changed

nel/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ set(project_namespace "${PROJECT_NAME}")
9393
set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
9494
set(package_components 3d georges gui ligo misc net pacs sevenzip sound snd_lowlevel) # TODO append in components to have actual list of build targets
9595
set(package_required_dependencies CURL Freetype)
96-
set(package_gui_dependencies Lua Luabind)
96+
set(package_gui_dependencies Luabind)
9797

9898

9999
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")

vcpkg-ports/cpptest/usage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
vcpkg-sample-library provides CMake targets:
1+
cpptest provides CMake targets:
22

33
find_package(CppTest REQUIRED)
44

vcpkg-ports/luabind/usage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
vcpkg-sample-library provides CMake targets:
1+
luabind provides CMake targets:
22

33
find_package(Luabind REQUIRED)
44

vcpkg.json

Lines changed: 89 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,98 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3+
"name": "ryzom-core",
4+
"version-string": "4.1.0.0",
35
"dependencies": [
4-
"cpptest",
5-
"curl",
6-
"ffmpeg",
7-
"freetype",
86
"giflib",
9-
"gtest",
107
"libjpeg-turbo",
118
"libogg",
129
"libpng",
1310
"libvorbis",
14-
"libxml2",
15-
"lua",
16-
"luabind",
17-
"openal-soft",
18-
"openssl",
19-
"qt5",
20-
"zlib"
21-
]
11+
"openal-soft"
12+
],
13+
"default-features": [
14+
"nel"
15+
],
16+
"features": {
17+
"nel": {
18+
"description": "Builds NeL", "dependencies": [{
19+
"name": "ryzom-core",
20+
"default-features": false,
21+
"features": ["nel-3d", "nel-gui", "nel-net", "nel-web"]
22+
}]
23+
},
24+
"nel-3d": {
25+
"description": "Builds with 3D support", "dependencies": [
26+
{
27+
"name": "ryzom-core",
28+
"default-features": false,
29+
"features": ["nel-misc"]
30+
},
31+
"freetype"
32+
]
33+
},
34+
"nel-gui": {
35+
"description": "Builds with GUI support", "dependencies": ["lua","luabind","qt5"]
36+
},
37+
"nel-misc": {
38+
"description": [],
39+
"dependencies": ["libxml2","zlib"]
40+
},
41+
"nel-net": {
42+
"description": "Builds with NET support", "dependencies": []
43+
},
44+
"nel-web": {
45+
"description": "Builds with WEB support", "dependencies": [
46+
{
47+
"name": "ryzom-core",
48+
"default-features": false,
49+
"features": ["nel-misc"]
50+
},
51+
"curl",
52+
"libxml2",
53+
"openssl"
54+
]
55+
},
56+
"nelns": {
57+
"description": "Builds NeL Network Services", "dependencies": [
58+
{
59+
"name": "ryzom-core",
60+
"default-features": false,
61+
"features": ["nel-misc", "nel-net"]
62+
}
63+
]
64+
},
65+
"ryzom": {
66+
"description": "Builds Ryzom", "dependencies": [{
67+
"name": "ryzom-core",
68+
"default-features": false,
69+
"features": ["ryzom-client", "ryzom-server", "ryzom-tools"]
70+
}]
71+
},
72+
"ryzom-client": {
73+
"description": "Builds Ryzom Client", "dependencies": [
74+
{
75+
"name": "ryzom-core",
76+
"default-features": false,
77+
"features": ["nel-misc"]
78+
},
79+
"luabind"
80+
]
81+
},
82+
"ryzom-server": {
83+
"description": "Builds Ryzom Services", "dependencies": []
84+
},
85+
"ryzom-tools": {
86+
"description": "Builds Ryzom Tools", "dependencies": []
87+
},
88+
"ffmpeg": {
89+
"description": "Builds with ffmpeg support", "dependencies": ["ffmpeg"]
90+
},
91+
"msquic": {
92+
"description": "Builds with msquic", "dependencies": ["msquic"]
93+
},
94+
"testing": {
95+
"description": "Builds tests", "dependencies": ["cpptest", "gtest"]
96+
}
97+
}
2298
}

0 commit comments

Comments
 (0)