AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

Browse Source
This commit is contained in:
David Williams 2012-01-05 21:03:13 +00:00
commit c0eed7f7d3
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
documentation/CMakeLists.txt
View File

@ -15,6 +15,11 @@ if(SPHINXBUILD_EXECUTABLE AND QT_QCOLLECTIONGENERATOR_EXECUTABLE)
) )
add_dependencies(manual doc) add_dependencies(manual doc)
else() else()
message(STATUS "`sphinx-build` was not found. Try setting SPHINXBUILD_EXECUTABLE to its location.") if(NOT SPHINXBUILD_EXECUTABLE)
message(STATUS "`sphinx-build` was not found. Try setting SPHINXBUILD_EXECUTABLE to its location.")
endif()
if(NOT QT_QCOLLECTIONGENERATOR_EXECUTABLE)
message(STATUS "`qhelpgenerator` was not found. Try setting QT_QCOLLECTIONGENERATOR_EXECUTABLE to its location.")
endif()
set(BUILD_MANUAL NO PARENT_SCOPE) set(BUILD_MANUAL NO PARENT_SCOPE)
endif() endif()

8
library/Doxyfile.in
View File

@ -901,7 +901,7 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name. # will append .docset to the name.
DOCSET_BUNDLE_ID = org.thermite3d.PolyVox DOCSET_BUNDLE_ID = com.volumesoffun.polyvox
# If the GENERATE_HTMLHELP tag is set to YES, additional index files # If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the # will be generated that can be used as input for tools like the
@ -965,7 +965,7 @@ GENERATE_QHP = YES
# Qt Help Project output. For more information please see # Qt Help Project output. For more information please see
# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>. # <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
QHP_NAMESPACE = org.thermite3d.polyvox QHP_NAMESPACE = com.volumesoffun.polyvox
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see # Qt Help Project output. For more information please see
@ -1451,14 +1451,14 @@ TEMPLATE_RELATIONS = YES
# file showing the direct and indirect include dependencies of the file with # file showing the direct and indirect include dependencies of the file with
# other documented files. # other documented files.
INCLUDE_GRAPH = YES INCLUDE_GRAPH = NO
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
# HAVE_DOT tags are set to YES then doxygen will generate a graph for each # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
# documented header file showing the documented files that directly or # documented header file showing the documented files that directly or
# indirectly include this file. # indirectly include this file.
INCLUDED_BY_GRAPH = YES INCLUDED_BY_GRAPH = NO
# If the CALL_GRAPH and HAVE_DOT options are set to YES then # If the CALL_GRAPH and HAVE_DOT options are set to YES then
# doxygen will generate a call dependency graph for every global function # doxygen will generate a call dependency graph for every global function

6
library/polyvox.qhcp.in
View File

@ -3,11 +3,11 @@
<QHelpCollectionProject version="1.0"> <QHelpCollectionProject version="1.0">
<assistant> <assistant>
<title>PolyVox Documentation</title> <title>PolyVox Documentation</title>
<homePage>qthelp://org.thermite3d.polyvox/api/index.html</homePage> <homePage>qthelp://com.volumesoffun.polyvox/api/index.html</homePage>
<startPage>qthelp://org.thermite3d.polyvox/api/index.html</startPage> <startPage>qthelp://com.volumesoffun.polyvox/api/index.html</startPage>
<!-- Disable the documentation manager so that there's no option to add more docs to this shell instance --> <!-- Disable the documentation manager so that there's no option to add more docs to this shell instance -->
<enableDocumentationManager>false</enableDocumentationManager> <enableDocumentationManager>false</enableDocumentationManager>
<cacheDirectory>thermite3d/polyvox</cacheDirectory> <cacheDirectory>volumesoffun/polyvox</cacheDirectory>
</assistant> </assistant>
<docFiles> <docFiles>
<!-- This section says that polyvox.qch will be created from index.qhp when qcollectiongenerator is run --> <!-- This section says that polyvox.qch will be created from index.qhp when qcollectiongenerator is run -->