summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-09-16 11:39:59 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2010-09-17 10:36:18 -0300
commitb8436f6b1e1efb4da51c6bcc6c22d997541d10c6 (patch)
treead5881bbbd4933fc863c8371b6b8630716613db1 /doc
parent75b44379d3e9e5f6dc4e6943b2f2229e32802892 (diff)
downloadpyside-b8436f6b1e1efb4da51c6bcc6c22d997541d10c6.tar.gz
pyside-b8436f6b1e1efb4da51c6bcc6c22d997541d10c6.tar.xz
pyside-b8436f6b1e1efb4da51c6bcc6c22d997541d10c6.zip
Fix doc generation and only generate docs for QtDeclarative module when it was found.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 37dc8d6..92389b9 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -27,7 +27,7 @@ macro(create_doc module typesystem_path)
string(REGEX REPLACE "^Qt" "" module_name ${module})
string(TOLOWER ${module_name} module_name)
add_custom_target("${module}-apidoc"
-COMMAND ${GENERATOR} --generatorSet=qtdoc
+COMMAND ${GENERATORRUNNER_BINARY} --generatorSet=qtdoc
${pyside_BINARY_DIR}/global.h
--include-paths=${QT_INCLUDE_DIR}:${QT_QTCORE_INCLUDE_DIR}
--typesystem-paths=${pyside_SOURCE_DIR}:${${module}_BINARY_DIR}:${typesystem_path}
@@ -61,7 +61,9 @@ create_doc(QtScriptTools "${QtCore_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtGui_SO
create_doc(QtTest "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
create_doc(QtXmlPatterns "${QtCore_SOURCE_DIR}")
create_doc(phonon "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
-create_doc(QtDeclarative "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
+if (QT_QTDECLARATIVE_FOUND)
+ create_doc(QtDeclarative "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
+endif()
#create devhelp file
add_custom_target(apidevhelp