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.

Sign up for GitHub

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

Jump to bottom

[WIP] Sphinx fix #919

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Sphinx fix #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5ebb4
FindSphinx.cmake: Fix for newer sphinx versions
arfoll Aug 23, 2018
236c63c
python2/CMakeLists.txt: make SWIG doc interfaces depend on wrapper gen
arfoll Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cmake/modules/FindSphinx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ if (SPHINX_EXECUTABLE)
OUTPUT_VARIABLE SPHINX_VERSION_STRING
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
if (SPHINX_VERSION_STRING)
if (SPHINX_VERSION_STRING MATCHES "^Sphinx")
string(REPLACE "Sphinx (sphinx-build) " "" SPHINX_VERSION ${SPHINX_VERSION_STRING})
message (STATUS "Sphinx version is ${SPHINX_VERSION}")
else ()
# newer sphinx builds just say sphinx-build
string(REPLACE "sphinx-build " "" SPHINX_VERSION ${SPHINX_VERSION_STRING})
endif ()
message (STATUS "Sphinx version is ${SPHINX_VERSION}")
endif ()

mark_as_advanced (SPHINX_EXECUTABLE)
4 changes: 2 additions & 2 deletions src/python/python2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ target_include_directories(${SWIG_MODULE_python2-mraa_REAL_NAME}

if (DOXYGEN_FOUND AND PYTHON2_EXECUTABLE)
foreach (_file ${DOCCLASSES})
add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} ${_file}class_doc_i)
add_dependencies (gen_python2-mraa_mraa2PYTHON_wrap ${_file}class_doc_i)
endforeach ()
add_dependencies (${SWIG_MODULE_python2-mraa_REAL_NAME} common_hpp_doc_i)
add_dependencies (gen_python2-mraa_mraa2PYTHON_wrap common_hpp_doc_i)
endif ()

set_target_properties (${SWIG_MODULE_python2-mraa_REAL_NAME} PROPERTIES
Expand Down