Commit 76b795c
committed
[build] Move handling of Cocoa option after FreeType
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.patch1 parent 1f1c820 commit 76b795c
1 file changed
Lines changed: 12 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | 103 | | |
116 | 104 | | |
117 | 105 | | |
| |||
285 | 273 | | |
286 | 274 | | |
287 | 275 | | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
288 | 288 | | |
289 | 289 | | |
290 | 290 | | |
| |||
0 commit comments