fix: Fix build with qapt-qt6

Use cmake to find the depend qapt-qt6 or qapt and link it.

Log: Fix build with qapt-qt6

CMakeLists.txt

@@ -30,6 +30,16 @@ else()
 endif()
 message("   >>> Build with DTK: ${DTK_VERSION_MAJOR}")
 
+if (QT_DESIRED_VERSION MATCHES 6)
+    find_package(QApt-qt6 REQUIRED)
+    include_directories(${QApt-qt6_INCLUDE_DIRS})
+    set(QAPT_LIB QApt-qt6)
+else()
+    find_package(QApt REQUIRED)
+    include_directories(${QApt_INCLUDE_DIRS})
+    set(QAPT_LIB QApt)
+endif()
+
 add_subdirectory(src/AptInstallDepend)
 add_subdirectory(src/deb-installer)
 

src/deb-installer/CMakeLists.txt

@@ -179,11 +179,11 @@ file(GLOB_RECURSE APP_SRCS
 add_executable(${PROJECT_NAME} ${APP_SRCS} ${APP_QRC})
 
 target_include_directories(${APP_BIN_NAME}
-    PUBLIC ${DtkWidget_INCLUDE_DIRS} ${OBJECT_BINARY_DIR})
+    PUBLIC ${OBJECT_BINARY_DIR})
 
 target_link_libraries(${APP_BIN_NAME}
     ${LINK_LIBS}
-    QApt
+    ${QAPT_LIB}
 )
 set(CMAKE_INSTALL_PREFIX /usr)
 

src/deepin-deb-installer-dev/CMakeLists.txt

@@ -31,7 +31,6 @@ set(LINK_LIBS
     Qt${QT_DESIRED_VERSION}::Core
     Qt${QT_DESIRED_VERSION}::DBus
     Qt${QT_DESIRED_VERSION}::Concurrent
-    QApt
 )
 
 include_directories(${CMAKE_CURRENT_LIST_DIR})
@@ -54,7 +53,7 @@ add_library( ${APP_BIN_NAME} SHARED ${APP_SRCS})
 target_link_libraries(${APP_BIN_NAME}
     PRIVATE
     ${LINK_LIBS}
-    QApt
+    ${QAPT_LIB}
 )
 
 set(CMAKE_INSTALL_PREFIX /usr)

tests/CMakeLists.txt

@@ -162,7 +162,7 @@ add_executable(${APP_BIN_NAME_TEST} ${APP_SRCS} ${APP_QRC} ${TEST_ACCESSIBLE_HEA
 target_link_libraries(${APP_BIN_NAME_TEST}
     PUBLIC
     ${LINK_LIBS}
-    QApt
+    ${QAPT_LIB}
     ${GTEST_LIBRARIES}
     ${GTEST_MAIN_LIBRARIES}
     pthread