diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-19 14:35:26 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-19 14:54:13 +0100 |
| commit | c20d35d58dec8cb24914794956f8b0da5c335300 (patch) | |
| tree | ece334f2ee0b6c886f52937ca552e7caae8b7cb5 | |
| parent | dafb8a7603a7c7e6091e25ddba704d250a1cd795 (diff) | |
Fix building without doc generator
The generator subproject would still add the qtdocgenerator
source file even if neither QtXmlPatterns nor libxml/libxslt2
were found, causing link errors.
This is since the value of DISABLE_DOCSTRINGS was not propagated
up from the ApiExtractor subproject. Set it to the parent scope from
there as well.
Change-Id: If8dc7b0437ef8a8c1e71d822328bcc3809252b57
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/shiboken2/ApiExtractor/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt index c2a4c208e..65150eb92 100644 --- a/sources/shiboken2/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt @@ -46,6 +46,9 @@ if(NOT Qt5XmlPatterns_FOUND AND NOT HAS_LIBXSLT) "Documentation will not be built due to missing dependency (no Qt5XmlPatterns found).") endif() +# Export to parent scope so that generator/CMakeLists.txt gets it +set(DISABLE_DOCSTRINGS ${DISABLE_DOCSTRINGS} PARENT_SCOPE) + add_library(apiextractor STATIC ${apiextractor_SRC}) target_include_directories(apiextractor PRIVATE ${CLANG_EXTRA_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} |