e0500ddd81
Qt 6.3.0 OBS-URL: https://build.opensuse.org/request/show/970780 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/python3-pyside6?expand=0&rev=9
127 lines
6.6 KiB
Diff
127 lines
6.6 KiB
Diff
From d64f9ed25aba35e44f6397461b66d49545f65c07 Mon Sep 17 00:00:00 2001
|
|
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
Date: Sun, 25 Apr 2021 16:14:31 +0200
|
|
Subject: [PATCH] Don't install CMake files into versioned directories
|
|
|
|
Experience shows this causes issues.
|
|
---
|
|
sources/pyside6/libpyside/CMakeLists.txt | 10 +++++-----
|
|
sources/pyside6/libpysideqml/CMakeLists.txt | 10 +++++-----
|
|
sources/shiboken6/data/CMakeLists.txt | 10 +++++-----
|
|
sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
|
|
4 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
|
|
index 0b2f7a097..a8807b9d7 100644
|
|
--- a/sources/pyside6/libpyside/CMakeLists.txt
|
|
+++ b/sources/pyside6/libpyside/CMakeLists.txt
|
|
@@ -153,7 +153,7 @@ set(PYSIDE_GLUE "${CMAKE_INSTALL_PREFIX}/share/PySide6${pyside6_SUFFIX}/glue")
|
|
configure_package_config_file(
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/PySide6Config-spec.cmake.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}"
|
|
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6"
|
|
PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE
|
|
)
|
|
|
|
@@ -170,16 +170,16 @@ install(TARGETS pyside6 EXPORT PySide6Targets
|
|
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
|
RUNTIME DESTINATION bin)
|
|
install(EXPORT PySide6Targets NAMESPACE PySide6::
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pyside6${pyside6_SUFFIX}.pc"
|
|
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6Config.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6")
|
|
diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt
|
|
index 42238c8cb..580c8fdff 100644
|
|
--- a/sources/pyside6/libpysideqml/CMakeLists.txt
|
|
+++ b/sources/pyside6/libpysideqml/CMakeLists.txt
|
|
@@ -63,7 +63,7 @@ qfp_strip_library("pyside6qml")
|
|
configure_package_config_file(
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig-spec.cmake.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}"
|
|
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml"
|
|
)
|
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig.cmake.in"
|
|
@@ -79,14 +79,14 @@ install(TARGETS pyside6qml EXPORT PySide6QmlTargets
|
|
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
|
RUNTIME DESTINATION bin)
|
|
install(EXPORT PySide6QmlTargets NAMESPACE PySide6Qml::
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfig.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
|
|
|
install(FILES
|
|
"${CMAKE_CURRENT_BINARY_DIR}/install/PySide6QmlConfig${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfigVersion.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml-${BINDING_API_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml")
|
|
diff --git a/sources/shiboken6/data/CMakeLists.txt b/sources/shiboken6/data/CMakeLists.txt
|
|
index 80dd7ca36..88d9487da 100644
|
|
--- a/sources/shiboken6/data/CMakeLists.txt
|
|
+++ b/sources/shiboken6/data/CMakeLists.txt
|
|
@@ -29,7 +29,7 @@ endif()
|
|
configure_package_config_file(
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/Shiboken6Config-spec.cmake.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}"
|
|
+ INSTALL_DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
|
|
PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
|
|
)
|
|
|
|
@@ -41,16 +41,16 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken6.pc.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc" @ONLY)
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6Config.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken6Config${PYTHON_CONFIG_SUFFIX}.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken6ConfigVersion.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ShibokenHelpers.cmake"
|
|
- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION}")
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6")
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shiboken6${shiboken6_SUFFIX}.pc"
|
|
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
|
|
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
|
|
index c65dcdb44..7447d1d71 100644
|
|
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
|
|
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
|
|
@@ -179,4 +179,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets
|
|
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
|
|
RUNTIME DESTINATION bin)
|
|
install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
|
|
- DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION})
|
|
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6)
|
|
--
|
|
2.35.1
|
|
|