Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(cmake): Prioritize vendored includes over system-wide #3182

Merged
merged 1 commit into from
Sep 16, 2024

Conversation

jmou
Copy link
Contributor

@jmou jmou commented Sep 14, 2024

Description

Sunshine will still compile with the vendored headers, even if the system has its own ffmpeg headers installed.

Issues Fixed or Closed

Fixes #3169.

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Copy link
Member

@ReenigneArcher ReenigneArcher left a comment

Choose a reason for hiding this comment

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

Nice, I didn't know about this option. Could you add it to the other locations where we use include_directories as well?

cmake/compile_definitions/common.cmake Outdated Show resolved Hide resolved
@ReenigneArcher ReenigneArcher changed the title Prioritize vendored includes over system-wide build(cmake): Prioritize vendored includes over system-wide Sep 14, 2024
@jmou
Copy link
Contributor Author

jmou commented Sep 14, 2024

Would it be preferable to set https://cmake.org/cmake/help/latest/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.html instead?

@ReenigneArcher
Copy link
Member

No, there's only 4 places this would need to be added, which would prevent all packagers from having to add a new CLI arg to their build.

@ReenigneArcher ReenigneArcher added this to the stable release milestone Sep 14, 2024
@jmou
Copy link
Contributor Author

jmou commented Sep 16, 2024

OK, I have updated the other locations. FWIW I think it's harmless but unnecessary on the non-SYSTEM includes, since those should not conflict with system-wide includes anyway.

Copy link

sonarcloud bot commented Sep 16, 2024

Copy link

codecov bot commented Sep 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 9.72%. Comparing base (c63678d) to head (7a266ca).
Report is 1 commits behind head on master.

Additional details and impacted files
@@          Coverage Diff           @@
##           master   #3182   +/-   ##
======================================
  Coverage    9.71%   9.72%           
======================================
  Files          77      77           
  Lines       14058   14058           
  Branches     6453    6453           
======================================
+ Hits         1366    1367    +1     
  Misses      10073   10073           
+ Partials     2619    2618    -1     
Flag Coverage Δ
Windows 5.07% <ø> (ø)
macOS-12 10.81% <ø> (+0.01%) ⬆️
macOS-13 10.70% <ø> (+0.01%) ⬆️
macOS-14 10.98% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 1 file with indirect coverage changes

@ReenigneArcher ReenigneArcher merged commit 698df68 into LizardByte:master Sep 16, 2024
37 of 38 checks passed
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Oct 9, 2024
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.

MacPorts build fails on M2 Mac Mini (2023) when ffmpeg is installed
2 participants