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

pugixml build fixes #1262

Merged
merged 1 commit into from
Oct 10, 2020
Merged

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Oct 5, 2020

In OIIO land, some users pointed out deficiencies in our build
scripts and how they find (or fail to find) pugixml on some platforms and
circumstances. This is an OSL side copy of the approach that seems to
fix things.

  • Bring back the idea of a Findpugixml.cmake file because it turns out
    that (for pugixml <= 1.10) the exported config files are not reliable.

  • Fix CI scripts to build PugiXML (with a few different versions). We
    previously were relying on the embedded version for all CI tests, which
    masked problems associated with using an external PugiXML.

Signed-off-by: Larry Gritz [email protected]

Copy link
Contributor

@aconty aconty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

* Bring back the idea of a Findpugixml.cmake file because it turns out
  that (for pugixml <= 1.10) the exported config files are not reliable.

* Fix CI scripts to build PugiXML (with a few different versions). We
  previously were relying on the embedded version for all CI tests, which
  masked problems associated with using an external PugiXML.

Signed-off-by: Larry Gritz <[email protected]>
@lgritz lgritz merged commit 58c9d16 into AcademySoftwareFoundation:master Oct 10, 2020
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Oct 10, 2020
* Bring back the idea of a Findpugixml.cmake file because it turns out
  that (for pugixml <= 1.10) the exported config files are not reliable.

* Fix CI scripts to build PugiXML (with a few different versions). We
  previously were relying on the embedded version for all CI tests, which
  masked problems associated with using an external PugiXML.

Signed-off-by: Larry Gritz <[email protected]>
@lgritz lgritz deleted the lg-pugixml branch October 10, 2020 23:31
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Oct 11, 2020
* Bring back the idea of a Findpugixml.cmake file because it turns out
  that (for pugixml <= 1.10) the exported config files are not reliable.

* Fix CI scripts to build PugiXML (with a few different versions). We
  previously were relying on the embedded version for all CI tests, which
  masked problems associated with using an external PugiXML.

Signed-off-by: Larry Gritz <[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.

2 participants