diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2025-07-03 14:34:23 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2025-07-07 16:34:39 +0200 |
| commit | d99af1bcb149941898aa7ffd90015f6bb8926f06 (patch) | |
| tree | 0e831a2fb44d5221383cfb9057b32ece3e0876ec /sources/pyside6/libpysideqml | |
| parent | e21065009b616edc1f9b2c7ce25b73b1632c0246 (diff) | |
PySide: Consolidate pyside6qml into PySide6 CMake package
libpyside6qml is an integral part of PySide6 and is always distributed
alongside libpyside6. To simplify the CMake configuration:
1. Remove separate PySide6Qml CMake package.
2. Move pyside6qml target from its own export set to PySide6Targets.
3. Delete PySide6QmlConfig*.cmake files as they are no longer needed
Change-Id: If69db1b7c4056d50820eec1e60fde82664e0f1c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside6/libpysideqml')
4 files changed, 2 insertions, 48 deletions
diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt index 502fc9051..8707538bf 100644 --- a/sources/pyside6/libpysideqml/CMakeLists.txt +++ b/sources/pyside6/libpysideqml/CMakeLists.txt @@ -45,7 +45,6 @@ add_library(PySide6::pyside6qml ALIAS pyside6qml) target_include_directories(pyside6qml PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:PySide6Qml/include> ) target_compile_definitions(pyside6qml PRIVATE -DQT_LEAN_HEADERS=1 -DQT_NO_KEYWORDS=1) @@ -84,34 +83,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T qfp_strip_library("pyside6qml") -# Install-tree / relocatable package config file. -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" -) - -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfig.cmake" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfigVersion.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfigVersion.cmake" @ONLY) - install(FILES ${libpysideqml_HEADERS} DESTINATION ${BINDING_NAME}${pyside6qml_SUFFIX}/include) -install(TARGETS pyside6qml EXPORT PySide6QmlTargets +#built-time installation +install(TARGETS pyside6qml EXPORT PySide6Targets LIBRARY DESTINATION "${LIB_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION bin) -install(EXPORT PySide6QmlTargets NAMESPACE PySide6Qml:: - DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfig.cmake" - 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") - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySide6QmlConfigVersion.cmake" - DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6Qml") diff --git a/sources/pyside6/libpysideqml/PySide6QmlConfig-spec.cmake.in b/sources/pyside6/libpysideqml/PySide6QmlConfig-spec.cmake.in deleted file mode 100644 index 36eb4123a..000000000 --- a/sources/pyside6/libpysideqml/PySide6QmlConfig-spec.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -@PACKAGE_INIT@ - -# Import targets only when using an installed PySide6 config file (so not during a regular -# PySide6 build, or during a super project build). -if (NOT TARGET PySide6::pyside6qml) - include("${CMAKE_CURRENT_LIST_DIR}/PySide6QmlTargets.cmake") -endif() diff --git a/sources/pyside6/libpysideqml/PySide6QmlConfig.cmake.in b/sources/pyside6/libpysideqml/PySide6QmlConfig.cmake.in deleted file mode 100644 index dab0a6b13..000000000 --- a/sources/pyside6/libpysideqml/PySide6QmlConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -if (NOT PYTHON_CONFIG_SUFFIX) - message(STATUS "PySide6QmlConfig: Using default python: @SHIBOKEN_PYTHON_CONFIG_SUFFIX@") - SET(PYTHON_CONFIG_SUFFIX @SHIBOKEN_PYTHON_CONFIG_SUFFIX@) -endif() -include(${CMAKE_CURRENT_LIST_DIR}/PySide6QmlConfig${PYTHON_CONFIG_SUFFIX}.cmake) diff --git a/sources/pyside6/libpysideqml/PySide6QmlConfigVersion.cmake.in b/sources/pyside6/libpysideqml/PySide6QmlConfigVersion.cmake.in deleted file mode 100644 index f5073ce08..000000000 --- a/sources/pyside6/libpysideqml/PySide6QmlConfigVersion.cmake.in +++ /dev/null @@ -1,10 +0,0 @@ -set(PACKAGE_VERSION @BINDING_API_VERSION@) - -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") -endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) |