Tweaks to make build_usd.py work with ninja #590
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Paul is making pull requests while at Siggraph. Respect :)
…On Wed, Aug 15, 2018 at 9:51 AM Paul Molodowitch ***@***.***> wrote:
Description of Change(s)
Initially aimed to make it work on windows, but subsequently tested / got
it working on all 3 platforms: windows, linux (ubuntu), and MacOS
Fixes Issue(s)
- build_usd.py fails with --generator=Ninja
------------------------------
You can view, comment on, or merge this pull request online at:
#590
Commit Summary
- [build_usd] Allow building with Ninja build generator under windows
- [build_usd] store which dependency we're building on context
- [build_usd] fix for building OpenEXR-2.2 with Ninja
- [build_usd] Disable building OpenSubdiv with Ninja on windows
- [build_usd] use CMAKE_BUILD_TYPE for ninja, not --config
File Changes
- *M* build_scripts/build_usd.py
<https://github.com/PixarAnimationStudios/USD/pull/590/files#diff-0>
(81)
Patch Links:
- https://github.com/PixarAnimationStudios/USD/pull/590.patch
- https://github.com/PixarAnimationStudios/USD/pull/590.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#590>, or mute the
thread
<https://github.com/notifications/unsubscribe-auth/AAD3E7aADRv9AvpHlyvkH5GlXGPIX2MFks5uRFGEgaJpZM4V-cQD>
.
|
|
Filed as internal issue #164196. |
|
Should be fixed in OpenEXR 2.3. Maybe the 2.2 patches should be conditional on version. |
|
True - but build_usd is currently hardcoded to 2.2... and even if it were switched to 2.3, and we forget to remove this patch, it will just end up as a do-nothing patch in that case. |
|
Ah, that's true. Since OpenEXR is using CMake generator syntax now, the patch will never accidentally apply. And FWIW, for code review, the patches look correct from my perspective. |
|
+1 on the need for this one. Ninja builds are significantly faster on my local machine, and would really help dev process for me. |
sunyab
requested changes
Sep 8, 2018
| @@ -646,6 +677,34 @@ def InstallOpenEXR(context, force, buildArgs): | |||
|
|
|||
| ilmbaseSrcDir = os.path.join(srcDir, "IlmBase") | |||
| with CurrentWorkingDirectory(ilmbaseSrcDir): | |||
| # openexr 2.2 has a bug with Ninja: | |||
There was a problem hiding this comment.
Thanks for documenting this!
sunyab
added
the
blocked
apparently fixed in dev branch - see: AcademySoftwareFoundation/openexr#94 AcademySoftwareFoundation/openexr#142
Ninja seems to error - a bunch of warnings that are set as errors - so just use the Visual Studio builder for it for now
pmolodo
force-pushed
the
pr/build_usd_ninja_fixes
branch
from
5ddada5 to
e91c1ad
Compare
sunyab
approved these changes
Feb 20, 2019
sunyab
added
pending push
and removed
blocked
pixar-oss
added a commit
that referenced
this pull request
Feb 25, 2019
Tweaks to make build_usd.py work with ninja (Internal change: 1941305)
francis-wangfr
added a commit
to autodesk-forks/USD
that referenced
this pull request
Feb 8, 2024
…#590) * [HgiWebGPU] Update dawn and emscripten version - Update dawn version and remove section for getting a device - Replace all instances of the deprecated shaderModule.source to shaderModule.code - Update tint API and add option to preserve previous behavior * address comments * Fix Dawn windows build error * Fix build error that is caused by incorrect TF_API definition. * Modify dawn cmake file to include d3d12.h path. * Recover rmtree after testing is finished. * apply changes to google_depot_tools.py * handle additional case for tint structure * Add new static libs for higwebgpu * Make sure Dawn is built with static library for Windows and remove unnecessary path files. * Revert "OpenEXR and OpenImageIO change" that is a mistake to be merged into. * Revise new libraries for different platforms * Fix hgiwebgpu build and link errors that are caused by conflicts between 3rd parties shaderc and dawn because there are 2 times SPIRV tools built from shaderc and dawn. We need to replace shaderc with glslang in the future. * Clean up spirv folders and libs generated from shaderc. HgiWebGPU project needs to consume spirv libs generated from Dawn. * small cleanup * delete cache * set shared build to off Co-authored-by: wangfr <francis.wang@autodesk.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change(s)
Initially aimed to make it work on windows, but subsequently tested / got it working on all 3 platforms: windows, linux (ubuntu), and MacOS
Fixes Issue(s)