55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
From 426daf709be68710adcf7d43ef196ecd5ad0c01f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christophe Marin <christophe@krop.fr>
|
||
|
|
Date: Tue, 5 Sep 2023 12:17:31 +0200
|
||
|
|
Subject: [PATCH] Fix doc tools detection
|
||
|
|
|
||
|
|
- Fix QT_VERSION_MAJOR casing
|
||
|
|
- qhelpgenerator and qtattributionscanner are not installed in Qt binaries dir in
|
||
|
|
recent Qt6 releases.
|
||
|
|
|
||
|
|
Fixes #830
|
||
|
|
---
|
||
|
|
docs/CMakeLists.txt | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
||
|
|
index 20c663211..14e969ecb 100644
|
||
|
|
--- a/docs/CMakeLists.txt
|
||
|
|
+++ b/docs/CMakeLists.txt
|
||
|
|
@@ -8,11 +8,11 @@
|
||
|
|
#
|
||
|
|
|
||
|
|
# qdoc toolchain
|
||
|
|
-find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS Help)
|
||
|
|
-if(Qt_VERSION_MAJOR EQUAL 5)
|
||
|
|
- find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS AttributionsScannerTools)
|
||
|
|
-elseif(Qt_VERSION_MAJOR GREATER_EQUAL 6)
|
||
|
|
- find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS ToolsTools)
|
||
|
|
+find_package(Qt${QT_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS Help)
|
||
|
|
+if(QT_VERSION_MAJOR EQUAL 5)
|
||
|
|
+ find_package(Qt${QT_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS AttributionsScannerTools)
|
||
|
|
+elseif(QT_VERSION_MAJOR GREATER_EQUAL 6)
|
||
|
|
+ find_package(Qt${QT_VERSION_MAJOR} NO_MODULE QUIET OPTIONAL_COMPONENTS ToolsTools)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(TARGET Qt::qdoc)
|
||
|
|
@@ -25,13 +25,13 @@ if(TARGET Qt::qhelpgenerator)
|
||
|
|
# Required for Doxygen
|
||
|
|
get_target_property(QHELPGEN_EXECUTABLE Qt::qhelpgenerator IMPORTED_LOCATION)
|
||
|
|
else()
|
||
|
|
- find_program(QHELPGEN_EXECUTABLE qhelpgenerator HINTS ${QT_INSTALL_BINS})
|
||
|
|
+ find_program(QHELPGEN_EXECUTABLE qhelpgenerator HINTS ${QT_INSTALL_BINS} ${QT_INSTALL_LIBEXECS})
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(TARGET Qt::qtattributionsscanner)
|
||
|
|
set(QTATTRIBUTIONSSCANNER_EXECUTABLE Qt::qtattributionsscanner)
|
||
|
|
else()
|
||
|
|
- find_program(QTATTRIBUTIONSSCANNER_EXECUTABLE qtattributionsscanner HINTS ${QT_INSTALL_BINS})
|
||
|
|
+ find_program(QTATTRIBUTIONSSCANNER_EXECUTABLE qtattributionsscanner HINTS ${QT_INSTALL_BINS} ${QT_INSTALL_LIBEXECS})
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if(NOT DEFINED QDOC_TEMPLATE_DIR)
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|