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

Mac OS 11.6 local build fixes #4788

Merged
merged 3 commits into from
Feb 10, 2022
Merged

Mac OS 11.6 local build fixes #4788

merged 3 commits into from
Feb 10, 2022

Conversation

scsides
Copy link
Contributor

@scsides scsides commented Feb 10, 2022

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@scsides scsides merged commit 447603d into DOI-USGS:7.0 Feb 10, 2022
@jlaura
Copy link
Collaborator

jlaura commented Feb 10, 2022

@scsides I don't know that we want to merge this with hard coded PATHs to a local machine. This is non-portable to any other dev. What are the alternatives?

@scsides
Copy link
Contributor Author

scsides commented Feb 10, 2022

Yes I know. This is a topic I would like to discuss at the next SU. We need a standard location for the includes, or use the environment variable ability for find_package. There may be other options I'm not thinking of.

scsides added a commit to scsides/ISIS3 that referenced this pull request Feb 11, 2022
* xalan is required for ISIS, see cmakelists.txt

* Fix conda build for Mac 11.6
scsides added a commit that referenced this pull request Feb 11, 2022
* Add a list of browse records to the output rdr if they exist on the cube (#4774)

* Converted TGO IngestReingest Category Test. (#4789)

* Fixed disk trashing on input cube reads (#4793)

* Prepwork for 7.0.0 RC1

* Cleaning up the Markdown a bit

I saw that some sections had wrong section numbers as they were hardcoded instead of making use of Markdown's auto-numbering.
I repaired the indents for auto-numbering to work in the first half of the document and didn't touch the 2nd half where things looked okay.

* Fixed jigsaw observation mode (#4791)

* Test modification

* Added changelog

* Revert "added custom target to copy over camera.plugin files on ninja install solves #3834 (#4769)"

This reverts commit 2681ffe.

* updates for conda build of 7.0 (#4783)

* xalan is required for ISIS, see cmakelists.txt (#4785)

* Mac OS 11.6 local build fixes (#4788)

* xalan is required for ISIS, see cmakelists.txt

* Fix conda build for Mac 11.6

Co-authored-by: acpaquette <[email protected]>
Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Michael Aye <[email protected]>
Co-authored-by: Jesse Mapel <[email protected]>
Co-authored-by: Jesse Mapel <[email protected]>
scsides added a commit that referenced this pull request Feb 11, 2022
* Add a list of browse records to the output rdr if they exist on the cube (#4774)

* Converted TGO IngestReingest Category Test. (#4789)

* Fixed disk trashing on input cube reads (#4793)

* Prepwork for 7.0.0 RC1

* Cleaning up the Markdown a bit

I saw that some sections had wrong section numbers as they were hardcoded instead of making use of Markdown's auto-numbering.
I repaired the indents for auto-numbering to work in the first half of the document and didn't touch the 2nd half where things looked okay.

* Fixed jigsaw observation mode (#4791)

* Test modification

* Added changelog

* Revert "added custom target to copy over camera.plugin files on ninja install solves #3834 (#4769)"

This reverts commit 2681ffe.

* updates for conda build of 7.0 (#4783)

* xalan is required for ISIS, see cmakelists.txt (#4785)

* Mac OS 11.6 local build fixes (#4788)

* xalan is required for ISIS, see cmakelists.txt

* Fix conda build for Mac 11.6

* Added log entry for #4793 (#4796)

Co-authored-by: acpaquette <[email protected]>
Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Michael Aye <[email protected]>
Co-authored-by: Jesse Mapel <[email protected]>
Co-authored-by: Jesse Mapel <[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