Skip to content

Commit

Permalink
Make separate feature for OpenGL load tests dependencies. (#940)
Browse files Browse the repository at this point in the history
So OpenGL load tests-specific dependency is only installed when those
tests are configured.
  • Loading branch information
MarkCallow authored Sep 8, 2024
1 parent e6e2105 commit 382a261
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
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
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

0 comments on commit 382a261

Please sign in to comment.