diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-04-12 12:48:12 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-04-23 07:34:36 +0000 |
| commit | c1ec25c5325a50fe2b2000b35a425badab1cd75b (patch) | |
| tree | ab70754c5eb9c5b1a7e12a0afdfebd050e33a331 /sources/shiboken2 | |
| parent | 77a433f80ea32f19507f0992b96aacf481a43304 (diff) | |
Add shiboken2/ApiExtractor doc generation
Changed the target name because there was a conflict,
and now is possible to `make doc_apiextractor` inside
the *_build/shiboken2/ApiExtractor/ directory.
Task-number: PYSIDE-363
Task-number: PYSIDE-221
Change-Id: I0f330166a89ba25b616b9d665a4a1fcfb2d90241
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/doc/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/doc/conf.py.in | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt index 20d1d9a89..8d68b0dcf 100644 --- a/sources/shiboken2/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt @@ -1,5 +1,7 @@ project(apiextractor) +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) find_package(LibXml2 2.6.32) find_package(LibXslt 1.1.19) @@ -61,6 +63,7 @@ parser/enumvalue.cpp set(APIEXTRACTOR_EXTRA_INCLUDES ${CLANG_EXTRA_INCLUDES}) set(APIEXTRACTOR_EXTRA_LIBRARIES ${CLANG_EXTRA_LIBRARIES}) +add_subdirectory(doc) if (NOT DISABLE_DOCSTRINGS) set(apiextractor_SRC ${apiextractor_SRC} diff --git a/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt b/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt index d78844dc8..a1995e96f 100644 --- a/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt @@ -1,10 +1,10 @@ - +message("Building ApiExtractor documentation") find_program(SPHINX sphinx-build DOC "Path to sphinx-build binary.") if (SPHINX) - message("-- sphinx-build - found") + message(STATUS "sphinx-build - found") configure_file(conf.py.in conf.py @ONLY) - add_custom_target(doc ${SPHINX} -b html -c . ${CMAKE_CURRENT_SOURCE_DIR} html ) + add_custom_target(doc_apiextractor ${SPHINX} -b html -c . ${CMAKE_CURRENT_SOURCE_DIR} html ) else() - message("-- sphinx-build - not found! doc target disabled") -endif()
\ No newline at end of file + message(STATUS "sphinx-build - not found! doc_apiextractor target disabled") +endif() diff --git a/sources/shiboken2/ApiExtractor/doc/conf.py.in b/sources/shiboken2/ApiExtractor/doc/conf.py.in index 3a42707ad..7251aaccd 100644 --- a/sources/shiboken2/ApiExtractor/doc/conf.py.in +++ b/sources/shiboken2/ApiExtractor/doc/conf.py.in @@ -22,7 +22,8 @@ import sys, os # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.refcounting', 'sphinx.ext.coverage'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', + 'sphinx.ext.ifconfig', 'sphinx.ext.coverage'] rst_epilog = """ .. |project| replace:: API Extractor |