Skip to content

Commit 47ea05a

Browse files
authored
Merge pull request #676 from sebproell/docs-structuring
Organize documentation into subfolders
2 parents 2afabe3 + 030177c commit 47ea05a

File tree

132 files changed

+62
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+62
-266
lines changed

README.md

Lines changed: 1 addition & 1 deletion

apps/create_rtdfiles/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ set(OBJS_CREATERTD
1111
add_executable(create_rtd EXCLUDE_FROM_ALL ${OBJS_CREATERTD})
1212
set_target_properties(create_rtd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
1313
four_c_set_up_executable(create_rtd)
14-
add_custom_target(rtd DEPENDS create_rtd)

doc/documentation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if(FOUR_C_BUILD_DOCUMENTATION)
4343
${_sphinx_OUT_DIR}/reference_docs/4C-cmake-presets.txt
4444
COMMAND
4545
${SPHINX_EXECUTABLE} -W -n -q -b html # warnings are errors and be nit-picky
46-
-i "${CMAKE_CURRENT_SOURCE_DIR}" -i "${_sphinx_OUT_DIR}/reference_docs" -i
46+
-i "${CMAKE_CURRENT_SOURCE_DIR}/src" -i "${_sphinx_OUT_DIR}/reference_docs" -i
4747
"${PROJECT_SOURCE_DIR}/tests/framework-test" -i "${_sphinx_TPLDEPEND_DIR}" -o
4848
"${_sphinx_HTML_DIR}" -c "${_sphinx_OUT_DIR}" -s "${PROJECT_BINARY_DIR}/doc/tmp"
4949
DEPENDS create_rtd ${FOUR_C_EXECUTABLE_NAME}

doc/documentation/conf.py.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import sys
1313
import os
1414
# sys.path.append(os.path.abspath('.../site-packages/sphinx/ext'))
15-
sys.path.append('@PROJECT_BINARY_DIR@/doc/tmp/python')
16-
#
15+
# Include our own python helper modules
16+
sys.path.append('@PROJECT_SOURCE_DIR@/doc/documentation/python')
1717
import plot
1818

1919

-2.43 KB
Binary file not shown.
-2.6 KB
Binary file not shown.
-3.13 KB
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)