Commit da5589a
Restructure Conan package to standard CCI layout (#238)
Reorganize the Conan package directory layout to follow the Conan Center
Index / aswf-docker conventions, as suggested in #238, and fix several
latent bugs in the recipe along the way.
Layout changes (package()):
- Headers now all live under include/: the OFX C API at the root, with
host- and plugin-support headers in include/HostSupport and
include/Support (and include/Support/Plugins for the .H helpers).
- The CMake build module moves to lib/cmake/OpenFX.cmake, with
Info.plist.in co-located so add_ofx_plugin resolves it relative to the
module (CMAKE_CURRENT_LIST_DIR) rather than the consumer's
CMAKE_SOURCE_DIR, which only worked inside this repo.
- LICENSE goes to licenses/openfx/ (a per-package subdir avoids clashes
when many packages share an install prefix); README/install docs to
res/openfx/.
package_info() updated to match the new include/lib/cmake paths.
Latent recipe bugs fixed in passing:
- "LICENSE, README.md, INSTALL.md" was a single invalid copy pattern, so
no docs were ever packaged; LICENSE/install.md case also didn't match.
- Support headers were copied from the wrong path (Support/*.h is empty;
they live in Support/include) so they were missing from the package.
- Support/Plugins helper headers use a .H extension that the *.h pattern
missed on case-sensitive filesystems.
- cimg and spdlog are direct requirements but were not referenced by any
component, which makes package_info() error out under modern Conan
(and thus fails for consumers); they are now claimed by the components
whose example code uses them.
Validated end to end with `conan create` (Ninja, Release): the package
builds, lays out as above, and test_package consumes it — building the
Invert example plugin via add_ofx_plugin (exercising the relocated
Info.plist.in) and passing the property-set compliance checks.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Gary Oberbrunner <garyo@darkstarsystems.com>1 parent 5ff71cf commit da5589a
2 files changed
Lines changed: 63 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
50 | 66 | | |
51 | 67 | | |
52 | 68 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
73 | 99 | | |
74 | 100 | | |
75 | 101 | | |
76 | 102 | | |
77 | | - | |
| 103 | + | |
78 | 104 | | |
79 | 105 | | |
80 | | - | |
81 | | - | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
82 | 109 | | |
83 | | - | |
84 | | - | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
0 commit comments