Skip to content

use CMake setting for osx deployment target - #59

Merged
sandboxcoder merged 2 commits into
streamlabsfrom
rno/fix-osx-target
Aug 26, 2026
Merged

use CMake setting for osx deployment target#59
sandboxcoder merged 2 commits into
streamlabsfrom
rno/fix-osx-target

Conversation

@sandboxcoder

@sandboxcoder sandboxcoder commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

set CMAKE_OSX_DEPLOYMENT_TARGET before initial toolchain initialization.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the macOS CI build script to stop explicitly setting/passing CMAKE_OSX_DEPLOYMENT_TARGET, with the intent to rely on the value defined in CMakeLists.txt instead.

Changes:

  • Removed the script-side defaulting of CMAKE_OSX_DEPLOYMENT_TARGET.
  • Removed -DCMAKE_OSX_DEPLOYMENT_TARGET=... from the cmake .. configure invocation.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread ci/build-osx.sh
Comment on lines 37 to 41
# Configure
cmake .. \
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} \
-DUIOHOOKDIR=${PWD}/deps/${DEPS} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
${NODEJS_VERSION_PARAM} \

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Comment thread CMakeLists.txt
Comment on lines 11 to 13
endif()
endif()
endif()

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@copilot we do not use universal mac build? Can you re-evaluate this branch?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Re-evaluated: since this project never uses universal (multi-arch) builds, CMAKE_OSX_ARCHITECTURES is always a single value (arm64 or x86_64) — never a list like arm64;x86_64. The STREQUAL "arm64" check in CMakeLists.txt is therefore correct and reliable.

Additionally, CMAKE_OSX_DEPLOYMENT_TARGET is set before project() (lines 2–13 vs line 14), so CMake sees it during compiler/toolchain initialization — the timing concern doesn't apply here either.

No changes needed.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

@sandboxcoder
sandboxcoder merged commit 6d4c3f3 into streamlabs Aug 26, 2026
14 checks passed
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.

5 participants