Skip to content

build : fix xcframework + cmake clean-up - #27304

Merged
ggerganov merged 6 commits into
masterfrom
gg/build-fixes
Aug 18, 2026
Merged

build : fix xcframework + cmake clean-up#27304
ggerganov merged 6 commits into
masterfrom
gg/build-fixes

Conversation

@ggerganov

Copy link
Copy Markdown
Member

Overview

cont #27262

  • The xcframework now also depends on the vendored hash library.
  • Use CMake aliases for vendored targets

Requirements

CMake reserves "::" in target names for imported/alias targets, so the real
target keeps the name vendor-hash and a vendor::hash ALIAS target is added.
Consumers (mtmd, llama-gguf-hash) now link against the namespaced alias.

Assisted-by: pi:llama.cpp/Qwen3.8-27B
@ggerganov
ggerganov requested review from a team and danbev as code owners August 18, 2026 07:43
@github-actions github-actions Bot added mtmd Related to multimodal functionality (video/image/audio) vendor labels Aug 18, 2026
Add INTERFACE targets for the header-only vendor libs (miniaudio, nlohmann,
sheredom, stb) and ALIAS targets named vendor::<lib> for all of them,
including cpp-httplib and hash. Each exposes the vendor/ root so includes
are namespaced, e.g. <nlohmann/json.hpp>.

Consolidate the per-lib add_subdirectory calls into a single
add_subdirectory(vendor), keeping the cpp-httplib gate on LLAMA_BUILD_COMMON.
Consumers (llama-common, mtmd) now link the aliases instead of relying on
raw vendor/ include paths.

hash: consumers now include via "hash/hash.h"; the vendor/hash dir is kept
as a PRIVATE include so the synced upstream sources compile unmodified.

Assisted-by: pi:llama.cpp/Qwen3.8-27B
Assisted-by: pi:llama.cpp/Qwen3.8-27B
@ggerganov
ggerganov requested a review from a team as a code owner August 18, 2026 07:57
@github-actions github-actions Bot added documentation Improvements or additions to documentation build Compilation issues labels Aug 18, 2026
@ggerganov

Copy link
Copy Markdown
Member Author

Added header-only CMake aliases to the rest of the vendors - more canonical CMake usage.

Comment thread common/CMakeLists.txt Outdated
@ggerganov
ggerganov merged commit 27e345b into master Aug 18, 2026
32 of 35 checks passed
@ggerganov
ggerganov deleted the gg/build-fixes branch August 18, 2026 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Compilation issues documentation Improvements or additions to documentation mtmd Related to multimodal functionality (video/image/audio) vendor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants