Repository navigation
fix(gamepad): forward-port SDL option scoping to main - #1545
Conversation
The gamepad plugin set its SDL3 options with set(... CACHE BOOL "" FORCE). The OAK plugin's bundled SDL2 reads the same SDL_* names and is configured later, so it was built with SDL_VIDEO OFF and `camera_plugin_oak --preview` failed with "SDL not built with video support" (test_oak_camera.py too). Use normal variables instead. SDL3 honors them (CMP0077) and they stay in the gamepad directory scope. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Grecia Salazar Estrada <gsalazarestr@nvidia.com> (cherry picked from commit 835ed9b) Signed-off-by: fvaloppi-nv <fvaloppi@nvidia.com>
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
Description
Building the gamepad and OAK plugins together forces
SDL_VIDEO=OFFinto the global CMake cache, so OAK's SDL2 preview fails withSDL not built with video support. Scope the gamepad's SDL3 options to its directory so OAK retains video support.Forward-port the original fix from #1435, already merged into
release/1.7.x, tomain. This is a cherry-pick of 835ed9b with the same stable patch ID.Related: NVBug 7053924 (Thor) and NVBug 7053285 (same SDL option conflict).
Existing build directories need a fresh configure without the stale CMake cache, which retains the forced SDL settings.
Type of change
Testing
SKIP=check-copyright-year pre-commit run --all-filespassed.git diff --checkpassed; stable patch ID matches the original fix.Checklist
SKIP=check-copyright-year pre-commit run --all-filesgit commit -s) per the DCOSummary by CodeRabbit