AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

find sphinx-build before calling build.py

Browse Source 
this allows us to use sphinx-build-3, as user might already in a python3
world, and distros, like fedora 28, tend to add a "-3" suffix to sphinx-build.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
Kefu Chai 2018-10-12 16:01:54 +08:00 committed by Victor Zverovich
parent 08a65c2282
commit 07200f445a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/CMakeLists.txt
View File

@ -4,8 +4,11 @@ if (NOT DOXYGEN)
return ()
endif ()
find_program(SPHINX_EXECUTABLE
NAMES sphinx-build sphinx-build-3)
add_custom_target(doc
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION})
SOURCES api.rst syntax.rst build.py conf.py _templates/layout.html)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/

3
doc/build.py
View File

@ -100,7 +100,8 @@ def build_docs(version='dev', **kwargs):
raise CalledProcessError(p.returncode, cmd)
html_dir = os.path.join(work_dir, 'html')
main_versions = reversed(versions[-3:])
check_call(['sphinx-build',
sphinx_build = os.environ.get('SPHINX_EXECUTABLE', 'sphinx-build')
check_call([sphinx_build,
'-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir),
'-Dversion=' + version, '-Drelease=' + version,
'-Aversion=' + version, '-Aversions=' + ','.join(main_versions),