Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pxrConfig.cmake #787

Merged
merged 2 commits into from
Mar 27, 2019
Merged

Fix pxrConfig.cmake #787

merged 2 commits into from
Mar 27, 2019

Conversation

meshula
Copy link
Member

@meshula meshula commented Mar 8, 2019

Description of Change(s)

Fixes the installation of the pxrConfig.cmake file for both static and shared USD build variants

  • Adds a mechanism to export PXR_STATIC when required
  • Adds DbgHelp and shlwapi to the Windows static build
  • pxrConfig.cmake unconditionally includes cmake scripts that describe the libraries, so it is necessary to ensure associated cmake files are also exported properly as part of the installation process
  • fix selection logic around monolithic and non-monolithic build when generating config files

Fixes Issue(s)

  • pxrConfig.cmake should enable find_package(pxr) and remove the need to write ad hoc FindUSD.cmake scripts. pxrConfig.cmake references files that were not actually exported, making the config file non-functional

  • pxrConfig.cmake targets were not set up for a static build at all

  • Does not address creating a valid pxrConfig.cmake for monolithic builds. usd_m is created by concatenating object files which shouldn't actually be individually exported. A different mechanism, using tricks, is likely necessary to create a pxrConfig.cmake for monolithic builds. According to this issue: https://gitlab.kitware.com/cmake/cmake/issues/17357 - the exact situation of usd_m is not currently supported.

@jilliene
Copy link

Filed as internal issue #USD-5136

@pixar-oss pixar-oss merged commit 6b5e95e into PixarAnimationStudios:dev Mar 27, 2019
pixar-oss added a commit that referenced this pull request Mar 27, 2019
Fix pxrConfig.cmake

(Internal change: 1948579)
@meshula meshula deleted the static_build branch March 27, 2019 23:22
AdamFelt pushed a commit to autodesk-forks/USD that referenced this pull request Apr 16, 2024
…nl/OGSMOD-4406

* OGSMOD-4406 run all the unit test, and the filter by TestSkipList
* OGSMOD-4406 adjust Ctest timeout and number of jobs. Archive Testing folder on failures and junit now works well on reports generated from xcode
* OGSMOD-4406 skip test testSdfListOp on Windows, it takes too long to run on Debug.
* OGSMOD-4406 check xcresultparser checksum

---------

Co-authored-by: Luis Ehlen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants