Commit 470fc51
committed
Merge #230: cmake: add ONLY_CAPNP target_capnp_sources option
81c6526 cmake: add ONLY_CAPNP target_capnp_sources option (Ryan Ofsky)
Pull request description:
Make `target_capnp_sources` function take `ONLY_CAPNP` option to only add cap'n proto-generated files to the target library and not add libmultiprocess-generated ones.
This is needed in bitcoin/bitcoin#10102 to support building with ENABLE_IPC=ON and ENABLE_WALLET=OFF because libmultiprocess-generated wallet files `wallet.capnp.proxy*.c++` can't be built without causing link errors, while the `wallet.capnp.c++` file is still necessary to build because it is referenced by `init.capnp` and `node.capnp` there.
ACKs for top commit:
hebasto:
ACK 81c6526, I have reviewed the code and it looks OK.
Tree-SHA512: f85da2e480da00b374be4fde9abebf152f49f493b7fd33c2c1f1ae24fc3cdf6db9e242b160edd84f3be42b3daafbd9be989c8c76c71063f65236f96c381e51861 file changed
+11
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | 88 | | |
92 | | - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
93 | 96 | | |
94 | 97 | | |
95 | 98 | | |
| |||
111 | 114 | | |
112 | 115 | | |
113 | 116 | | |
114 | | - | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
115 | 120 | | |
0 commit comments