add PXR_SYMLINK_HEADER_FILES cmake option #150
Conversation
pmolodo
force-pushed
the
symlink_headers
branch
from
c9301a7
to
acf470c
Compare
pmolodo
force-pushed
the
symlink_headers
branch
from
7b45b91
to
6dd6754
Compare
|
Hi @elrond79, I just committed cff6390 which I think resolves the IDE issues with the copied headers without needing this build option. I tried this on Xcode and MSVC and confirmed that compile errors take me to headers in the source tree instead of the build directory. I haven't tried CLion, but I'm hoping it'll work the same there. Let me know if this works for you if/when you get a chance to try it out. Thanks! |
|
Cool, we'll check to see if this does the trick! |
|
Filed as internal issue #147126. |
|
So, finally got around to giving this a shot - alas, it looks like our IDE (clion) does not support special handling for #line directives. Also - one nice thing about the symlink approach is it really works for pretty much everything - ie, if you use "find" or "grep -R" from the command line, then open it up in a text editor, you don't need to worry about which version of the file you have. However - if you folks find really are against this, then we can drop the PR (though I think some others might find it handy!) Also - out of curiosity, what IDE are you folks using for developing USD? |
Handy for some IDEs which "find" the symlinked versions by default; also removes confusion about which to edit. Defaults to off.
|
Ok, seems like this PR likely isn't going to happen (though I still think it's a good idea!), so I'm going to close the request. |
…nt height for GenericText. (PixarAnimationStudios#150) TextSytem introduces a DecorationLayout structure which is composed of some contiguous line sections, and the section data is calculated by textLayout. GenericText --(1:m)-- Final decoration(s) --(1:m)-- TextLine decoration(s) --(1:m)-- Section(s) --(1:m)-- Same Color TextRun(s) Fix line color: Every section will be created to one underline/overline curve drawItem in USD. The _lineColor of Section will be converted to displayColor for every curve drawItem. Fix line breaking result from different font size in one line: Contiguous line sections in one line is stored in same Decoration, and Decoration has only one yPosition.
Description of Change(s)
On build, CMake automatically copies the header files into a slightly different location in the cmake build directory (ie, from pxr/base/lib/tf to CMAKE_DIR/pxr/base/tf). Unfortunately, this plays havoc with certain IDEs (ie, CLion), which find the "copied" headers instead of the "source" headers.
This change adds a PXR_SYMLINK_HEADER_FILES option which makes CMake symlink these headers to the cmake build dir, instead of copying, so that you can freely edit the headers in either location without having to worry which header you have.
On install, the headers are still properly copied, not symlinked.
Included Commit(s)
c9301a7e3d78858bf81849f22bdf898ae4dca1957b45b91acf470c6dd6754Fixes Issue(s)