Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make separate feature for OpenGL load tests dependencies. #940

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Make separate feature for OpenGL load tests dependencies. #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ set_property( CACHE KTX_FEATURE_LOADTEST_APPS

if(NOT KTX_FEATURE_LOADTEST_APPS MATCHES OFF)
set(VCPKG_MANIFEST_FEATURES loadtests)
if (KTX_FEATURE_LOADTEST_APPS MATCHES OpenGL)
list(APPEND VCPKG_MANIFEST_FEATURES glloadtests)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
# Explicitly set the triplet to avoid potential trouble.
# Automatic triplet selection in CI, which runs on x86_64, selects
Expand Down
15 changes: 10 additions & 5 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
"name": "ktx-software",
"features": {
"loadtests": {
"description": "OpenGL & Vulkan Load Tests. All dependencies from vcpkg",
"description": "OpenGL & Vulkan Load Tests.",
"dependencies": [
"assimp",
{
"name": "glew",
"platform": "windows"
},
{
"name": "sdl2",
"default-features": true,
Expand All @@ -18,6 +14,15 @@
]
}
]
},
"glloadtests": {
"description": "OpenGL Load Tests.",
"dependencies": [
{
"name": "glew",
"platform": "windows"
}
]
}
}
}
Expand Down
Loading