9c3e84c0dc
Update to 5.15.11 OBS-URL: https://build.opensuse.org/request/show/1121377 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=82
59 lines
2.5 KiB
Diff
59 lines
2.5 KiB
Diff
From 4d1ad8ef85e746dcb22fb87e23a8b0fdb7a7ccf2 Mon Sep 17 00:00:00 2001
|
|
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
Date: Tue, 15 Sep 2020 08:44:52 +0200
|
|
Subject: [PATCH] Don't assume qhelpgenerator is in PATH
|
|
|
|
There is no guarantee the qhelpgenerator executable is in PATH.
|
|
The build system will use the the Qt5::qhelpgenerator target
|
|
to get the exact location.
|
|
---
|
|
sources/pyside2/doc/CMakeLists.txt | 6 +++++-
|
|
sources/shiboken2/doc/CMakeLists.txt | 8 ++++++--
|
|
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt
|
|
index 950e486..4b0c7dc 100644
|
|
--- a/sources/pyside2/doc/CMakeLists.txt
|
|
+++ b/sources/pyside2/doc/CMakeLists.txt
|
|
@@ -138,10 +138,14 @@ if(DOC_OUTPUT_FORMAT STREQUAL "html")
|
|
COMMENT "Copying Shiboken docs..."
|
|
VERBATIM)
|
|
else()
|
|
+ # Use the Qt5::helpgenerator variable to get the executable location
|
|
+ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Help)
|
|
+ get_target_property(QHELPGENERATOR_EXECUTABLE Qt5::qhelpgenerator IMPORTED_LOCATION)
|
|
+
|
|
file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/html/PySide.qhp QHP_FILE)
|
|
add_custom_command(TARGET apidoc POST_BUILD
|
|
COMMAND ${PYTHON_EXECUTABLE} py_script.py
|
|
- COMMAND qhelpgenerator ${QHP_FILE}
|
|
+ COMMAND ${QHELPGENERATOR_EXECUTABLE} ${QHP_FILE}
|
|
COMMENT "Generating QCH from a QHP file..."
|
|
VERBATIM)
|
|
endif()
|
|
diff --git a/sources/shiboken2/doc/CMakeLists.txt b/sources/shiboken2/doc/CMakeLists.txt
|
|
index ae4858f..fb2a62d 100644
|
|
--- a/sources/shiboken2/doc/CMakeLists.txt
|
|
+++ b/sources/shiboken2/doc/CMakeLists.txt
|
|
@@ -36,11 +36,15 @@ except:
|
|
|
|
# create a custom command to generate QCH
|
|
if(DOC_OUTPUT_FORMAT STREQUAL "qthelp")
|
|
+ # Use the Qt5::helpgenerator variable to get the executable location
|
|
+ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Help)
|
|
+ get_target_property(QHELPGENERATOR_EXECUTABLE Qt5::qhelpgenerator IMPORTED_LOCATION)
|
|
+
|
|
file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/html/Shiboken.qhp QHP_FILE)
|
|
add_custom_command(TARGET doc POST_BUILD
|
|
COMMAND ${PYTHON_EXECUTABLE} py_script.py # ${CMAKE_CURRENT_BINARY_DIR}/html/Shiboken.qhp
|
|
- COMMAND qhelpgenerator ${QHP_FILE}
|
|
- COMMENT "Genereting QCH based on the QHP..."
|
|
+ COMMAND ${QHELPGENERATOR_EXECUTABLE} ${QHP_FILE}
|
|
+ COMMENT "Generating QCH based on the QHP..."
|
|
VERBATIM)
|
|
endif()
|
|
else()
|
|
--
|
|
2.42.0
|
|
|