Commit d0a4c29
committed
COMP: Pin DCMTK charset-conversion backend, disabling external iconv
DCMTK auto-detects an external libiconv and turns DCMTK_WITH_ICONV on when
one is found, which then runs an iconv try-compile during configure. In a
conda/pixi toolchain the conda iconv.h (which renames iconv -> libiconv) is
paired with the macOS SDK libiconv at link time, so the probe fails with
undefined _libiconv symbols and configure aborts.
ITK already selects the built-in oficonv backend
(DCMTK_ENABLE_BUILTIN_OFICONV_DATA), so the external-iconv probe is
redundant. Set DCMTK_WITH_ICONV=OFF explicitly in both the ICU and the
non-ICU branches so the backend is fixed by ITK rather than discovered from
whatever the build environment happens to provide.
Co-locate the three related options (DCMTK_ENABLE_BUILTIN_OFICONV_DATA,
DCMTK_WITH_ICU, DCMTK_WITH_ICONV) in CHARSET_CONVERSION_ARGS so their
interrelationship is visible in one place.1 parent 3609b55 commit d0a4c29
1 file changed
Lines changed: 19 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
10 | 18 | | |
11 | 19 | | |
12 | 20 | | |
| |||
81 | 89 | | |
82 | 90 | | |
83 | 91 | | |
84 | | - | |
| 92 | + | |
| 93 | + | |
85 | 94 | | |
86 | 95 | | |
87 | 96 | | |
| 97 | + | |
88 | 98 | | |
89 | 99 | | |
90 | 100 | | |
| |||
109 | 119 | | |
110 | 120 | | |
111 | 121 | | |
112 | | - | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
113 | 130 | | |
114 | 131 | | |
115 | 132 | | |
| |||
480 | 497 | | |
481 | 498 | | |
482 | 499 | | |
483 | | - | |
484 | 500 | | |
485 | 501 | | |
486 | 502 | | |
| |||
0 commit comments