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

Build sphinx/doxygen docs with CMake #201

Merged
merged 9 commits into from
Aug 30, 2021

Conversation

cary-ilm
Copy link
Member

  • The DOCS CMake option runs doxygen and sphinx to build the html
    documentation. Default if OFF. If ON, it requires doxygen and sphinx
    to be installed (found via FindSphinx.cmake).

  • Describe the documentation generation option in INSTALL.md.

  • Fix broken references in half.rst.

  • Remove quotes around some template function names in doxygen
    comments that result in unresolved references.

TODO: Something is still wonky here, it looks like doxygen gets invoked twice, and sphinx gets invoked even if nothing has changed, but I'm not sure how to specify the proper dependencies.

Signed-off-by: Cary Phillips cary@ilm.com

* The DOCS CMake option runs doxygen and sphinx to build the html
  documentation. Default if OFF. If ON, it requires doxygen and sphinx
  to be installed (found via FindSphinx.cmake).

* Describe the documentation generation option in INSTALL.md.

* Fix broken references in half.rst.

* Remove quotes around some template function names in doxygen
  comments that result in unresolved references.

Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm mentioned this pull request Aug 19, 2021
@@ -872,6 +872,8 @@ typedef Vec4<double> V4d;
// Normalize and length don't make sense for integer vectors, so disable them.
//----------------------------------------------------------------------------

/// @cond Doxygen_Suppress
Copy link
Contributor

Choose a reason for hiding this comment

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

Ooh, I didn't know about this!

Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm merged commit 68cce5d into AcademySoftwareFoundation:master Aug 30, 2021
cary-ilm added a commit to cary-ilm/Imath that referenced this pull request Aug 30, 2021
* Build sphinx/doxygen docs with CMake

* The DOCS CMake option runs doxygen and sphinx to build the html
  documentation. Default if OFF. If ON, it requires doxygen and sphinx
  to be installed (found via FindSphinx.cmake).

* Describe the documentation generation option in INSTALL.md.

* Fix broken references in half.rst.

* Remove quotes around some template function names in doxygen
  comments that result in unresolved references.

Signed-off-by: Cary Phillips <cary@ilm.com>

* Add copyright/license

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix dependencies

Signed-off-by: Cary Phillips <cary@ilm.com>

* Restore conf.py for RTD

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix typo in conf.py for RTD

Signed-off-by: Cary Phillips <cary@ilm.com>

* typo

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix merge

Signed-off-by: Cary Phillips <cary@ilm.com>

* Remove Doxyfile

Signed-off-by: Cary Phillips <cary@ilm.com>
cary-ilm added a commit that referenced this pull request Sep 1, 2021
* Build sphinx/doxygen docs with CMake

* The DOCS CMake option runs doxygen and sphinx to build the html
  documentation. Default if OFF. If ON, it requires doxygen and sphinx
  to be installed (found via FindSphinx.cmake).

* Describe the documentation generation option in INSTALL.md.

* Fix broken references in half.rst.

* Remove quotes around some template function names in doxygen
  comments that result in unresolved references.

Signed-off-by: Cary Phillips <cary@ilm.com>

* Add copyright/license

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix dependencies

Signed-off-by: Cary Phillips <cary@ilm.com>

* Restore conf.py for RTD

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix typo in conf.py for RTD

Signed-off-by: Cary Phillips <cary@ilm.com>

* typo

Signed-off-by: Cary Phillips <cary@ilm.com>

* Fix merge

Signed-off-by: Cary Phillips <cary@ilm.com>

* Remove Doxyfile

Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm added the v3.1.3 label Sep 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants