3rdparty: granular per-package system-library overrides#2091
Open
jcelerier wants to merge 10 commits into
Open
3rdparty: granular per-package system-library overrides#2091jcelerier wants to merge 10 commits into
jcelerier wants to merge 10 commits into
Conversation
jcelerier
force-pushed
the
feature/vendoring-cmake-variables
branch
from
002c37b to
003c2eb
Compare
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
…deEditor, clap Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
Extract phantomstyle, Gist, miniply, mikktspace, vcglib, opengametools, outcome, llfio and quickcpplib into their own targets instead of compiling their sources / include dirs directly into consumers. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
ssynth, miniply, mikktspace, vcglib, opengametools and Gist are now defined in 3rdparty/*.cmake like the other dependencies; the threedim and analysis plugins include() them. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
snappy, shmdata, sh4lt, suil and wiiuse now build the vendored copy when the system package is requested but not found, instead of failing. Bumps libossia (wiiuse). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
libossia #903 was merged; re-point at master (granular overrides) plus the wiiuse graceful-fallback follow-up (libossia #904) instead of the orphaned pre-merge branch commit. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
libossia #904 merged; point submodule at libossia master HEAD so the reference is reachable from master. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
Points at the libossia fixes branch (ossia/libossia#905) so score builds clean against current libossia master (unity Abseil + system wiiuse fallback). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
libossia #905 merged; point submodule at libossia master HEAD. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
…gametools Give the relocated standalone deps the same tri-state OSSIA_USE_SYSTEM_<pkg> find path + vendored fallback as the others, instead of vendored-only. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
jcelerier
force-pushed
the
feature/vendoring-cmake-variables
branch
from
28a1177 to
1e14e42
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lets distros unvendor third-party dependencies selectively instead of the all-or-nothing
SCORE_USE_SYSTEM_LIBRARIES.Mechanism
score_use_system(out pkg)incmake/ScoreConfiguration.cmake, mirroring libossia'sossia_use_system. The namespace is unified onOSSIA_USE_SYSTEM_*;SCORE_USE_SYSTEM_LIBRARIESstill works as a forwarding alias.OSSIA_USE_SYSTEM_<FindPackageName>cache variable. Empty → follows the global;ON/OFFoverrides that one package. Defaults unchanged (empty → global → vendored).Scope
3rdparty/*.cmakeguards converted (SndFile, Snappy, eigen, xtensor, snmalloc, shmdata, sh4lt, Suil, libpd, vst3, Faust).find_packagebranches to deps that previously had none: dspfilters, gamma, r8brain, simpleio, QCodeEditor, clap.score_lib_base(useSCORE_LIB_BASE_EXPORT, not separable): zipdownloader, QProgressIndicator, Qt-Color-Widgets.Requires ossia/libossia#903 (submodule bump included).
Validation
OSSIA_USE_SYSTEM_LIBRARIES=ONwith granularOFFfor the packages not installed locally): configures and compiles; only failure is unrelated system-FFmpegAVVulkanDeviceContextAPI skew in score-plugin-gfx.🤖 Generated with Claude Code