Skip to content

build(macos): configure C++ standard and ICU root#5101

Merged
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
martona:fix-macos-build
May 13, 2026
Merged

build(macos): configure C++ standard and ICU root#5101
ReenigneArcher merged 5 commits into
LizardByte:masterfrom
martona:fix-macos-build

Conversation

@martona
Copy link
Copy Markdown
Contributor

@martona martona commented May 12, 2026

Description

Pass the project C++ 23 standard explicitly so fetched dependencies build against modern headers. C++23 was chosen because it's already used for the sunshine target in cmake/targets/common.cmake and by the Homebrew formula in packaging/sunshine.rb, but those don't apply early enough to dependencies built through scripts/macos_build.sh. This can break when Boost falls back to FetchContent.

Point CMake at Homebrew's icu4c@78 prefix to match the dependency installed by the macOS build path. Without this, CMake can pick up inconsistent ICU headers/configuration from the Apple SDK or system paths while Boost.Locale is built from source.

Mirror the manual macOS build script in CI so the two paths stay aligned, as requested in the script comments.

Screenshot

Issues Fixed or Closed

Roadmap Issues

Type of Change

  • feat: New feature (non-breaking change which adds functionality)
  • fix: Bug fix (non-breaking change which fixes an issue)
  • docs: Documentation only changes
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semicolons, etc.)
  • refactor: Code change that neither fixes a bug nor adds a feature
  • perf: Code change that improves performance
  • test: Adding missing tests or correcting existing tests
  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Other changes that don't modify src or test files
  • revert: Reverts a previous commit
  • BREAKING CHANGE: Introduces a breaking change (can be combined with any type above)

Checklist

  • Code follows the style guidelines of this project
  • Code has been self-reviewed
  • Code has been commented, particularly in hard-to-understand areas
  • Code docstring/documentation-blocks for new or existing methods/components have been added or updated
  • Unit tests have been added or updated for any new or modified functionality

AI Usage

  • None: No AI tools were used in creating this PR
  • Light: AI provided minor assistance (formatting, simple suggestions)
  • Moderate: AI helped with code generation or debugging specific parts
  • Heavy: AI generated most or all of the code changes

@martona martona changed the title Fix macOS build dependency configuration build(macos): configure C++ standard and ICU root May 12, 2026
@ReenigneArcher
Copy link
Copy Markdown
Member

I'm confused about setting CXX_STANDARD here. We already set it in cmake itself, and we always use fetch content in our CI builds, so I'm not sure this is actually an issue.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 12, 2026

The existing CXX_STANDARD setting applies only to the sunshine target, and it is set after dependencies/common.cmake has already added the FetchContent targets.

In my local build, Homebrew had Boost 1.90 installed, while the project requested exactly 1.89. CMake rejected the newer Homebrew Boost and fell back to FetchContent, so Boost.Locale was built as part of the project. That fetched Boost target then compiled against Homebrew’s ICU headers without a C++17+ default and failed on ICU headers using constructs like auto non-type template parameters and std::is_same_v.

Passing -DCMAKE_CXX_STANDARD=23 at configure time makes the project default visible before FetchContent targets are created. I used 23 specifically because that is already the standard requested for the Sunshine target and the Homebrew packaging path.

That said, if you prefer, setting the project-wide C++ standard near the top-level CMake before dependencies are loaded would be cleaner than passing it from the macOS scripts.

I also wouldn't be offended if you chose to reject as it is very much an edge case and easy to work around with exports in .zshrc but I doubt I'm the only one to ever run into this.

@ReenigneArcher
Copy link
Copy Markdown
Member

I think this can probably affect Linux as well, so probably we could just set it in the top level CMakelists.txt as well as in the tests.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 12, 2026

Right, it probably does. Do you want me to take a crack at it?

@ReenigneArcher
Copy link
Copy Markdown
Member

Right, it probably does. Do you want me to take a crack at it?

Yes please!

@martona martona force-pushed the fix-macos-build branch from b578654 to 80b39a6 Compare May 13, 2026 01:21
@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 13, 2026

Done. It builds cleanly on macOS, I did not test elsewhere.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 13, 2026

And for good measure I updated /tests and /tools as well. You did not ask for the latter, but it makes sense since they were redundant. (I missed them earlier, apologies for all the noise.)

martona added 3 commits May 12, 2026 21:38
Pass the project C++ standard explicitly so fetched dependencies build against modern Homebrew headers.

Point CMake at Homebrew's icu4c@78 prefix to match the dependency installed by the macOS build path.

Mirror the manual macOS build script in CI so the two paths stay aligned.
@codecov
Copy link
Copy Markdown

codecov Bot commented May 13, 2026

Bundle Report

Changes will decrease total bundle size by 3.22kB (-0.2%) ⬇️. This is within the configured threshold ✅

Detailed changes
Bundle name Size Change
sunshine-esm 787.93kB -3.22kB (-0.41%) ⬇️

Affected Assets, Files, and Routes:

view changes for bundle: sunshine-esm

Assets Changed:

Asset Name Size Change Total Size Change (%)
assets/Notification-*.js -1.38kB 358.1kB -0.38%
assets/apps-*.js -1.84kB 10.12kB -15.35%

@codecov
Copy link
Copy Markdown

codecov Bot commented May 13, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.85%. Comparing base (0709990) to head (c31f60e).
⚠️ Report is 1 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5101      +/-   ##
==========================================
- Coverage   17.86%   17.85%   -0.01%     
==========================================
  Files         111      111              
  Lines       24005    24005              
  Branches    10619    10619              
==========================================
- Hits         4289     4287       -2     
+ Misses      18169    15502    -2667     
- Partials     1547     4216    +2669     
Flag Coverage Δ
Archlinux 11.23% <ø> (ø)
FreeBSD-14.3-aarch64 ?
FreeBSD-14.3-amd64 13.37% <ø> (+0.01%) ⬆️
Homebrew-ubuntu-22.04 13.58% <ø> (ø)
Linux-AppImage 12.16% <ø> (ø)
Windows-AMD64 14.84% <ø> (ø)
Windows-ARM64 13.23% <ø> (-0.01%) ⬇️
macOS-arm64 19.03% <ø> (ø)
macOS-x86_64 18.37% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 52 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0709990...c31f60e. Read the comment docs.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 13, 2026

The Linux failure was caused by setting the project C++ standard globally without also setting the CUDA standard before the sunshine target is created. Since sunshine includes CUDA sources on Linux, CMake tried to configure that target with CUDA C++23, which nvcc does not support.

I fixed that by setting CMAKE_CUDA_STANDARD to 17 at the top level before target creation, then removed the later CUDA standard setup from cmake/targets/common.cmake. Linux CUDA now builds locally.

Comment thread CMakeLists.txt
@sonarqubecloud
Copy link
Copy Markdown

@ReenigneArcher ReenigneArcher merged commit f9d1aca into LizardByte:master May 13, 2026
74 checks passed
fatebugs added a commit to fatebugs/Sunshine that referenced this pull request May 14, 2026
Bug fixes:
- Delay g_vdd_indices.push_back() and persist_display_count() until the new
  display is confirmed visible; roll back VddRemoveDisplay on failure without
  leaving stale index/persist state.
- Free SP_DEVICE_INTERFACE_DETAIL_DATA before break in OpenDeviceHandle to
  avoid memory leak.
- Remove duplicate and misspelled VDD_IOCTL_UNKONWN (same value as
  VDD_IOCTL_UPDATE).

Robustness:
- Replace DXGI-based enumerate_dxgi_outputs with EnumDisplayDevices-based
  enumerate_displays; DXGI_OUTPUT_DESC::DeviceName uses \\.\DISPLAYx
  format which never contains "PSCCDD0", making the old VDD-detection
  logic dead.
- Rewrite persist_display_count to update only the vdd_display_count line
  in-place, preserving comments, blank lines, and config file ordering.
- Use compare_exchange_strong in start_keepalive to prevent multiple
  threads (tray + HTTP + startup) from racing on thread creation.

Security:
- Add check_content_type + validate_csrf_token to addVddDisplay and
  removeVddDisplay POST endpoints.
- Add validate_csrf_token to removeAllVddDisplays.
- Fix addVddDisplay to set status=false when add_display fails.
- Fix removeVddDisplay status to reflect actual result.
- Add vdd::is_initialized check to removeAllVddDisplays; return proper
  error when driver is not available.

Cleanup:
- Remove unused $tp import from VirtualDisplay.vue.
- Remove extra </table> tag in docs/configuration.md.

fix(macos): preserve modifier state in input events (LizardByte#5102)
build(macos): configure C++ standard and ICU root (LizardByte#5101)
build(deps): Add SUNSHINE_SYSTEM_VULKAN_HEADERS option (LizardByte#5103)

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
ci: remove moonlight discord release announcement (LizardByte#5099)
build(deps): bump packaging/linux/flatpak/deps/shared-modules from `2dfad85` to `8c3f3cf` (LizardByte#5098)

build(deps): bump packaging/linux/flatpak/deps/shared-modules

Bumps [packaging/linux/flatpak/deps/shared-modules](https://github.com/flathub/shared-modules) from `2dfad85` to `8c3f3cf`.
- [Commits](flathub/shared-modules@2dfad85...8c3f3cf)

---
updated-dependencies:
- dependency-name: packaging/linux/flatpak/deps/shared-modules
  dependency-version: 8c3f3cfa5a4af9a696ff0bfb3ed0eba404faaf5d
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
build(deps): bump third-party/build-deps from `cd7d45a` to `d8b1d18` (LizardByte#5097)

Bumps [third-party/build-deps](https://github.com/LizardByte/build-deps) from `cd7d45a` to `d8b1d18`.
- [Release notes](https://github.com/LizardByte/build-deps/releases)
- [Commits](LizardByte/build-deps@cd7d45a...d8b1d18)

---
updated-dependencies:
- dependency-name: third-party/build-deps
  dependency-version: d8b1d18b7e82f8ee396bdd05e226896fa523b0df
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix: building without the system tray enabled (LizardByte#5092)
@martona martona deleted the fix-macos-build branch May 14, 2026 10:03
@ReenigneArcher
Copy link
Copy Markdown
Member

It's either a coincidence or this PR caused #5112

Do you have some idea why? It's not obvious to me looking at the changes here.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 14, 2026

I doubt it, the icu4c change was local to macOS, and the C++ standard setting should not cause DLL linkage errors. I'm looking though, stay tuned.

@ReenigneArcher
Copy link
Copy Markdown
Member

This was the only change though, unless the bug is in icu itself, which I didn't see any recent changes in.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 14, 2026

My windows build box is slow as hell and churning through git checkout recursive right now - i'll know more in maybe half an hour, but my working theory is that none of the mingw toolchain is pinned; something updated and caused a new icu dependency. Plausible?

@ReenigneArcher
Copy link
Copy Markdown
Member

Seems a bit odd as the last update was 2 weeks ago. https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-icu and all that changed was the pkgrel version.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 14, 2026

The more likely path is Boost. MSYS2 currently installs Boost 1.91, but Sunshine asks CMake for exactly Boost 1.89, so the system package is rejected and we fall back to FetchContent. After #5101, CMAKE_CXX_STANDARD=23 is set globally before dependencies are added, so fetched CMake projects see that setting too. That was intentional, but it means the fetched Boost build environment changed.

I do not yet know that C++23 specifically toggled the ICU dependency, but it's looking more likely with FetchContent being in play.

@martona
Copy link
Copy Markdown
Contributor Author

martona commented May 14, 2026

The good news is that Windows builds and runs cleanly with:

cmake -B build -G Ninja -S . -DBOOST_LOCALE_ENABLE_ICU=OFF ...

I also checked the codebase for actual Boost.Locale usage. The only real call site I found is Linux-only:

src/platform/linux/input/inputtino_keyboard.cpp

auto utf8_str = boost::locale::conv::to_utf<wchar_t>(utf8, utf8 + size, "UTF-8");
auto utf32_str = boost::locale::conv::utf_to_utf<char32_t>(utf8_str);

So Windows does not appear to need Boost.Locale’s ICU backend. macOS may be similar, but I’d keep the first fix scoped to Windows unless you’d prefer a broader cleanup.

Would you like me to work on a PR? I should be able to get it done today.

Edit: Nevermind, I see you beat me to it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants