diff --git a/CMakeLists.txt b/CMakeLists.txt index f045c0cc..ae5255ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,7 @@ cmake_minimum_required(VERSION 3.10) -if(NOT DEFINED VERSION) - set(VERSION 0.6.11) -endif() - -project(dde-launchpad VERSION ${VERSION}) +project(dde-launchpad VERSION 0.6.12) option(BUILD_TEST "Whether or not to build the tests" OFF) @@ -30,7 +26,7 @@ set(ASQT_NS AppStreamQt) find_package(QT NAMES ${QT_NS} REQUIRED COMPONENTS Core) find_package(${QT_NS} REQUIRED COMPONENTS Core Gui Concurrent Qml Svg Quick QuickControls2 LinguistTools) find_package(${DTK_NS} REQUIRED COMPONENTS Core Gui) -find_package(${ASQT_NS} 1.0) +find_package(${ASQT_NS} 1.0 REQUIRED) set_package_properties(${ASQT_NS} PROPERTIES DESCRIPTION "Library that lists Appstream resources" diff --git a/debian/control b/debian/control index b2b650a8..4dbc8dc9 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: libdtk6gui-dev, libdtk6declarative-dev, libdde-shell-dev (>= 0.0.10), - libappstreamqt-dev + libappstreamqt-dev (>= 1.0.0) Standards-Version: 4.6.0 Rules-Requires-Root: no diff --git a/desktopintegration.cpp b/desktopintegration.cpp index 9096a0b3..be5d640d 100644 --- a/desktopintegration.cpp +++ b/desktopintegration.cpp @@ -13,9 +13,7 @@ #include #include -#ifndef NO_APPSTREAM_QT #include -#endif #include "appwiz.h" #include "ddedock.h" diff --git a/src/ddeintegration/CMakeLists.txt b/src/ddeintegration/CMakeLists.txt index 4de4425b..a70b8439 100644 --- a/src/ddeintegration/CMakeLists.txt +++ b/src/ddeintegration/CMakeLists.txt @@ -144,14 +144,4 @@ target_link_libraries(dde-integration-dbus PUBLIC Qt::Concurrent PRIVATE - Qt::Core Qt::Gui ${DTK_NS}::Core launcher-utils) - -if (${ASQT_NS}_FOUND) - target_link_libraries(dde-integration-dbus - PRIVATE - ${ASQT_NS}) -else() - target_compile_definitions(dde-integration-dbus - PUBLIC NO_APPSTREAM_QT - ) -endif() + Qt::Core Qt::Gui ${DTK_NS}::Core ${ASQT_NS} launcher-utils)