Add MATERIALX_BUILD_MONOLITHIC option #1725
Conversation
ld-kerley
force-pushed
the
monolithic_build
branch
from
864e1e0 to
6edd7e7
Compare
|
I'm looking forward to this change; it will make my life easier on iOS in particular, but I think the mx cmake script has already reached a threshold of complexity that IMO necessitates a refactoring. This new change consistently does essentially the same thing per library, which runs a maintenance risk, moving forward, of someone fixing a bug or making an improvement in one place but not all places. I would recommend that rather than repeating the pattern of checking for the monolithic build and setting setting project properties in every sub library, it would good to instead replace all instances of |
ld-kerley
force-pushed
the
monolithic_build
branch
from
6edd7e7 to
c9bb18c
Compare
|
Great idea @meshula - and turned out pretty clean I think - I stole some inspiration from USD. I think there is some further clean up that can be done on the MaterialXRenderXXX modules, but I'd like to merge this first and do that in a follow up PR. The extracting the common logic out to the |
|
This looks like an excellent proposal to me, thanks @ld-kerley! Rather than adding a new Although I'm not against the idea of adding and maintaining an external CMake helper module, my thinking is that keeping the functions local makes them more visible to developers, and that we can take the step of making them external if needed further in the future. |
|
I do find this refactoring so much easier to follow, thank you for that :) |
|
No strong opinion either way - I was just mirroring what USD did to be honest, but if you'd prefer to avoid the external cmake helper, I'm fine with moving it over. |
Signed-off-by: Jonathan Stone <[email protected]>
Signed-off-by: Jonathan Stone <[email protected]>
jstone-lucasfilm
changed the title
Signed-off-by: Jonathan Stone <[email protected]>
Signed-off-by: Jonathan Stone <[email protected]>
There was a problem hiding this comment.
This looks like a significant improvement to me, thanks @ld-kerley!
Signed-off-by: Jonathan Stone <[email protected]>
Signed-off-by: Jonathan Stone <[email protected]>
jstone-lucasfilm
merged commit e7654d4
into
AcademySoftwareFoundation:dev_1.39
Introduced with the monolithic build PR #1725 the cmake export targets no longer had relative paths. An errant additional `target_include_directories` slipped in.
The `mx_add_library` refactor introduced in #1725, introduced a few bugs with installing files. `Generated.h` was incorrectly being ignored, instead `Generated.h.in` was being installed, and also the mdl library files were missing, also some resources were also not being installed. Should now be corrected in both monolithic and non-monolithic builds.
Working towards building Frameworks for macOS and IOS, this PR adds the option to build MaterialX as a single monolithic library.
CMake aliases are exported for the standard library targets aliased to the monolithic library to avoid changes being necessary downstream.