From 6d4ac91913f8dbc061a03fca1bd699a6248f3ad4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 15 Apr 2026 15:54:49 +0200 Subject: [PATCH] Fix installation Upstream decided to install files in non-standard locations. --- sources/pyside6/CMakeLists.txt | 2 +- sources/shiboken6/libshiboken/CMakeLists.txt | 2 +- sources/shiboken6_generator/generator/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt index bfe3956..b3f9946 100644 --- a/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt @@ -40,7 +40,7 @@ install(EXPORT PySide6Targets if(NOT is_pyside6_superproject_build) install(EXPORT PySide6WheelTargets NAMESPACE PySide6:: - DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/PySide6" + DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6" FILE PySide6Targets.cmake) endif() diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt index bc3569b..de7b06b 100644 --- a/sources/shiboken6/libshiboken/CMakeLists.txt +++ b/sources/shiboken6/libshiboken/CMakeLists.txt @@ -221,6 +221,6 @@ if(NOT is_pyside6_superproject_build) install(EXPORT Shiboken6WheelTargets NAMESPACE Shiboken6:: - DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/Shiboken6" + DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6" FILE Shiboken6Targets.cmake) endif() diff --git a/sources/shiboken6_generator/generator/CMakeLists.txt b/sources/shiboken6_generator/generator/CMakeLists.txt index 33bb413..fd2a9f3 100644 --- a/sources/shiboken6_generator/generator/CMakeLists.txt +++ b/sources/shiboken6_generator/generator/CMakeLists.txt @@ -72,11 +72,11 @@ install(EXPORT "${package_name}Targets" if(NOT is_pyside6_superproject_build) install(TARGETS shiboken6 EXPORT "${package_name}WheelTargets" - DESTINATION "shiboken6_generator") + DESTINATION "${BIN_INSTALL_DIR}") install(EXPORT "${package_name}WheelTargets" NAMESPACE "Shiboken6::" - DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/${package_name}" + DESTINATION "${LIB_INSTALL_DIR}/cmake/${package_name}" FILE "${package_name}Targets.cmake") endif() -- 2.53.0