Skip to content

Commit 98d3b59

Browse files
committed
Merge branch 'master' of github.com:TartanLlama/cpp-documentation-example
2 parents 8e0d45b + d688f9b commit 98d3b59

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
project ("CatCutifier")
44

5+
# Add the cmake folder so the FindSphinx module is found
56
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
67

78
add_subdirectory ("CatCutifier")

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@
22
An example of setting up CMake + Sphinx + Read the Docs for C++
33

44
See the documentation [here](https://cpp-documentation-example.readthedocs.io/en/latest/)
5+
6+
## Dependencies
7+
8+
- [Doxygen](http://www.doxygen.nl/download.html)
9+
- [Sphinx](https://www.sphinx-doc.org/en/master/usage/installation.html)
10+
- [Breathe](https://pypi.org/project/breathe/)
11+
- [sphinx_rtd_theme](https://github.com/rtfd/sphinx_rtd_theme)

docs/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
2121
# Only regenerate Doxygen when the Doxyfile or public headers change
2222
add_custom_command(OUTPUT ${DOXYGEN_INDEX_FILE}
2323
DEPENDS ${CAT_CUTIFIER_PUBLIC_HEADERS}
24-
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE_OUT}
24+
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE_OUT}
2525
MAIN_DEPENDENCY ${DOXYFILE_OUT} ${DOXYFILE_IN}
26-
COMMENT "Generating docs"
26+
COMMENT "Generating docs"
2727
VERBATIM)
2828

2929
# Nice named target so we can run the job easily
@@ -56,4 +56,4 @@ add_custom_target(Sphinx ALL DEPENDS ${SPHINX_INDEX_FILE})
5656

5757
include(GNUInstallDirs)
5858
install(DIRECTORY ${SPHINX_BUILD}
59-
DESTINATION ${CMAKE_INSTALL_DOCDIR})
59+
DESTINATION ${CMAKE_INSTALL_DOCDIR})

0 commit comments

Comments
 (0)