Skip to content

Add the JSON option sources to protoc-gen-swift's CMake target - #2164

Merged
thomasvl merged 1 commit into
apple:mainfrom
lenamonj:cmake-protoc-gen-swift-sources
Sep 6, 2026
Merged

thomasvl merged 1 commit into
apple:mainfrom
lenamonj:cmake-protoc-gen-swift-sources

Conversation

@lenamonj

@lenamonj lenamonj commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

Sources/protoc-gen-swift/CMakeLists.txt does not list json_options.pb.swift and json_enumvalue_options.pb.swift, added in #2111, so the CMake build of protoc-gen-swift has failed since then on the sources that use them. The two files are added in the position the sibling lists use.

cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release && cmake --build build fails on main and links protoc-gen-swift with this change.

@thomasvl thomasvl left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@thomasvl
thomasvl enabled auto-merge (squash) September 6, 2026 15:50
@thomasvl thomasvl added the 🆕 semver/minor Adds new public API. label Sep 6, 2026
@thomasvl
thomasvl merged commit 7469d27 into apple:main Sep 6, 2026
26 of 27 checks passed
@lenamonj
lenamonj deleted the cmake-protoc-gen-swift-sources branch September 7, 2026 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🆕 semver/minor Adds new public API.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants