Move handling of Cocoa option after FreeType#21389
Move handling of Cocoa option after FreeType#21389vepadulano wants to merge 1 commit intoroot-project:masterfrom
Conversation
018844b to
0faedfd
Compare
Test Results 22 files 22 suites 3d 2h 57m 33s ⏱️ For more details on these failures, see this check. Results for commit 76b795c. ♻️ This comment has been updated with latest results. |
|
Great! This change actually shows that the |
Actually it's even trickier than that! The logic for root/cmake/modules/SearchInstalledSoftware.cmake Lines 206 to 219 in 517a231 |
When building on Apple with Cocoa graphics, FreeType is required. Previously, there were two separate ways to check for FreeType availability: * The "standard" checks for builtins, forcing availability when `fail-on-missing` is ON, otherwise falling back to activating the builtin if the external package is not found * An injected check in the section related to Cocoa, which happened before the section for the builtin, which practically meant that on Apple with Cocoa enabled ROOT was always built with the builtin FreeType library. This commit proposes to move the section related to Cocoa after the section related to FreeType. This way, the build on Cocoa can only: * Fail if FreeType is not found, when `fail-on-missing` is ON * Use the FreeType seen by the rest of the build, the result of the checks in the FreeType section. As a result, MacOS builds can also now use an externally provided FreeType, useful e.g. for conda-forge builds. This commit removes the need for the following conda-forge patch: https://github.com/conda-forge/root-feedstock/blob/df86316b299d8214d3181d76c31925696f076d5e/recipe/patches/0009-disable-builtin-freetype-macos.patch
0faedfd to
76b795c
Compare
guitargeek
left a comment
There was a problem hiding this comment.
Thank you very much for this!
When building on Apple with Cocoa graphics, FreeType is required. Previously, there were two separate ways to check for FreeType availability:
fail-on-missingis ON, otherwise falling back to activating the builtin if the external package is not foundThis commit proposes to move the section related to Cocoa after the section related to FreeType. This way, the build on Cocoa can only:
fail-on-missingis ONAs a result, MacOS builds can also now use an externally provided FreeType, useful e.g. for conda-forge builds.
This commit removes the need for the following conda-forge patch: https://github.com/conda-forge/root-feedstock/blob/df86316b299d8214d3181d76c31925696f076d5e/recipe/patches/0009-disable-builtin-freetype-macos.patch