Skip to content

Commit 24d1a52

Browse files
committed
Add Qt6 suffix back to library name, bump ABI level instead
Apparently, there is stuff dynamically loading this that relies on the old name, so I guess we need to keep that suffix for a while.
1 parent 42902ed commit 24d1a52

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(BUILD_SHARED_LIBS ON)
1717
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
1818
include(GNUInstallDirs)
1919

20-
set(QPACKAGEKIT_API_LEVEL "1")
20+
set(QPACKAGEKIT_ABI_LEVEL "2")
2121

2222

2323
find_package(Qt6 6.8 REQUIRED COMPONENTS Core DBus)

src/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ set_source_files_properties(${PK_TRANSACTION_INTERFACE_XML} PROPERTIES NO_NAMESP
4545
qt6_add_dbus_interface(packagekitqt_SRC ${PK_INTERFACE_XML} daemonproxy)
4646
qt6_add_dbus_interface(packagekitqt_SRC ${PK_TRANSACTION_INTERFACE_XML} transactionproxy)
4747

48-
add_library(packagekitqt ${packagekitqt_SRC} ${packagekitqt_HEADERS} ${packagekitqt_HEADERS_PRIVATE})
49-
set_target_properties(packagekitqt PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${QPACKAGEKIT_API_LEVEL})
48+
add_library(packagekitqt6 ${packagekitqt_SRC} ${packagekitqt_HEADERS} ${packagekitqt_HEADERS_PRIVATE})
49+
set_target_properties(packagekitqt6 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${QPACKAGEKIT_ABI_LEVEL})
5050

51-
target_link_libraries(packagekitqt PUBLIC Qt6::DBus)
51+
target_link_libraries(packagekitqt6 PUBLIC Qt6::DBus)
5252

5353
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packagekitqt.pc.in
5454
${CMAKE_CURRENT_BINARY_DIR}/packagekitqt6.pc
5555
@ONLY
5656
)
57-
target_include_directories(packagekitqt INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/PackageKitQt/PackageKit/;${CMAKE_INSTALL_INCLUDEDIR}/PackageKitQt>")
58-
install(TARGETS packagekitqt EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
57+
target_include_directories(packagekitqt6 INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/PackageKitQt/PackageKit/;${CMAKE_INSTALL_INCLUDEDIR}/PackageKitQt>")
58+
install(TARGETS packagekitqt6 EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
5959
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/packagekitqt6.pc
6060
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
6161
)

src/modules/packagekit-qt-config.cmake.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
check_required_components(Qt@QT_VERSION_MAJOR@DBus)
44

5-
SET(PackageKitQt@QT_VERSION_MAJOR@_LIBRARIES "PK::packagekitqt")
5+
SET(PackageKitQt@QT_VERSION_MAJOR@_LIBRARIES "PK::packagekitqt6")
66

77
include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake")
8-
9-
add_library(PK::packagekitqt6 ALIAS PK::packagekitqt)

0 commit comments

Comments
 (0)