diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index a645de61..1ae35c61 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -9,17 +9,6 @@ # Contact KDAB at for commercial licensing options. # -# qhelpgenerator -find_program(QHELPGEN_EXECUTABLE qhelpgenerator - HINTS ${QT_INSTALL_BINS} -) -if(QHELPGEN_EXECUTABLE) - set(HAVE_QHELPGEN "YES") -else() - set(HAVE_QHELPGEN "NO") - message(STATUS "Unable to generate the API documentation in qch format. To fix, install the qthelpgenerator program which comes with Qt5.") -endif() - # Doxygen find_package(Doxygen) set_package_properties(Doxygen PROPERTIES @@ -28,12 +17,6 @@ set_package_properties(Doxygen PROPERTIES URL "https://www.doxygen.org" PURPOSE "Needed to build the API documentation." ) -if(DOXYGEN_DOT_EXECUTABLE) - set(HAVE_DOT "YES") -else() - set(HAVE_DOT "NO") - message(STATUS "Unable to provide inheritance diagrams for the API documentation. To fix, install the graphviz project from https://www.graphviz.org") -endif() if(DOXYGEN_FOUND) add_subdirectory(api) diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt index 7b732c17..d988ff02 100644 --- a/docs/api/CMakeLists.txt +++ b/docs/api/CMakeLists.txt @@ -9,6 +9,25 @@ # Contact KDAB at for commercial licensing options. # +# dot should come with Doxygen find_package(Doxygen) +if(DOXYGEN_DOT_EXECUTABLE) + set(HAVE_DOT "YES") +else() + set(HAVE_DOT "NO") + message(STATUS "Unable to provide inheritance diagrams for the API documentation. To fix, install the graphviz project from https://www.graphviz.org") +endif() + +# qhelpgenerator +find_program(QHELPGEN_EXECUTABLE qhelpgenerator + HINTS ${QT_INSTALL_BINS} +) +if(QHELPGEN_EXECUTABLE) + set(HAVE_QHELPGEN "YES") +else() + set(HAVE_QHELPGEN "NO") + message(STATUS "Unable to generate the API documentation in qch format. To fix, install the qthelpgenerator program which comes with Qt.") +endif() + find_file(QDOC_QTCORE_TAG qtcore.tags HINTS ${QT_INSTALL_DOCS}/qtcore HINTS ${QT_INSTALL_DATA}/doc/qtcore