diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-27 17:08:00 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-27 17:08:00 (GMT) |
| commit | 60a9a48717acfba2fac5f3424dc59f9c6ebc9117 (patch) | |
| tree | 452ee7a5a24a2daec468cdc6f6bfd09824f8246f | |
| parent | 970221c5d4235373cc4e44aff45fe5c2268add1e (diff) | |
| download | Doxygen-60a9a48717acfba2fac5f3424dc59f9c6ebc9117.zip Doxygen-60a9a48717acfba2fac5f3424dc59f9c6ebc9117.tar.gz Doxygen-60a9a48717acfba2fac5f3424dc59f9c6ebc9117.tar.bz2 | |
Some fixes made during packaging of the binaries
| -rw-r--r-- | addon/doxywizard/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | addon/doxywizard/doxywizard.cpp | 2 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index 810c0d0..a89864d 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -98,6 +98,7 @@ ${GENERATED_SRC_WIZARD}/config_doxyw.cpp ${GENERATED_SRC_WIZARD}/configdoc.cpp ${doxywizard_MOC} ${doxywizard_RESOURCES_RCC} +doxywizard.rc ) if(Qt5Core_FOUND) diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 4e0d1aa..56378ed 100755 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -208,7 +208,7 @@ void MainWindow::updateWorkingDir() void MainWindow::manual() { - QDesktopServices::openUrl(QUrl(QString::fromLatin1("http://www.doxygen.org/manual.html"))); + QDesktopServices::openUrl(QUrl(QString::fromLatin1("http://www.doxygen.org/manual/index.html"))); } void MainWindow::about() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 448646f..7beb485 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -144,7 +144,7 @@ set_source_files_properties(config.doc PROPERTIES GENERATED 1) ################################################################################ add_custom_target(run_doxygen COMMENT "Generating Latex and HTML documentation." - COMMAND ${DOXYGEN_EXECUTABLE} + COMMAND ${CMAKE_COMMAND} -E env VERSION=${VERSION} ${DOXYGEN_EXECUTABLE} DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc DEPENDS ${OUT_DOC_FILES} DEPENDS examples |