change to cmake

Change-Id: I82cd9d2bfd96003385c839ddaf0e454a4c1639d6

.gitignore

@@ -14,6 +14,7 @@
 
 build*/
 *.pro.user*
+CMakeLists.txt.user
 *.DS_Store
 *.qm
 

CMakeLists.txt

@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.7)
+
+set(VERSION 4.0)
+
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_CXX_FLAGS -Wall)
+
+if (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+
+    # generate qm
+    execute_process(COMMAND bash "translate_generation.sh"
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif ()
+
+file(GLOB INTERFACES "interfaces/*.h")
+
+add_subdirectory("frame")
+add_subdirectory("plugins")
+
+# Install settings
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX /usr)
+endif ()
+
+# qm files
+file(GLOB QM_FILES "translations/*.qm")
+install(FILES ${QM_FILES}
+        DESTINATION share/dde-dock/translations)
+
+## dev files
+install (FILES ${INTERFACES}
+         DESTINATION include/dde-dock)

dde-dock.pro

@@ -1,15 +0,0 @@
-
-TEMPLATE = subdirs
-SUBDIRS = frame \
-          plugins
-
-# Automating generation .qm files from .ts files
-CONFIG(release, debug|release) {
-    !system($$PWD/translate_generation.sh): error("Failed to generate translation")
-}
-TRANSLATIONS    = translations/dde-dock.ts
-
-qm_files.path = $${PREFIX}/share/dde-dock/translations/
-qm_files.files = translations/*.qm
-
-INSTALLS = qm_files

debian/control

@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 8.0.0), pkg-config,
  qtbase5-private-dev,
  libdframeworkdbus-dev,
  libgsettings-qt-dev,
- clang [mipsel mips64el]
+ clang
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org/
 

debian/rules

@@ -10,17 +10,5 @@ export QT_SELECT=5
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		DOCK_TRAY_USE_NATIVE_POPUP=YES
+		-DDOCK_TRAY_USE_NATIVE_POPUP=YES
-
-ifeq ($(DEB_BUILD_ARCH), mips64el)
-override_dh_auto_configure:
-	dh_auto_configure -- QMAKE_CC=clang QMAKE_CXX=clang++ \
-		DOCK_TRAY_USE_NATIVE_POPUP=YES
-endif
-
-ifeq ($(DEB_BUILD_ARCH), mipsel)
-override_dh_auto_configure:
-	dh_auto_configure -- QMAKE_CC=clang QMAKE_CXX=clang++ \
-		DOCK_TRAY_USE_NATIVE_POPUP=YES
-endif
 

frame/CMakeLists.txt

@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.7)
+
+project(dde-dock
+        VERSION ${VERSION})
+
+set(BIN_NAME dde-dock)
+
+configure_file(environments.h.in environments.h @ONLY)
+
+# Sources files
+file(GLOB_RECURSE SRCS "*.h" "*.cpp")
+
+# Find the library
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Concurrent REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11)
+pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
+
+# driver-manager
+add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} item/resources.qrc)
+target_include_directories(${BIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
+                                              ${XCB_EWMH_INCLUDE_DIRS}
+                                              ${DFrameworkDBus_INCLUDE_DIRS}
+                                              ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+                                              ${PROJECT_BINARY_DIR}
+                                              ../interfaces)
+target_link_libraries(${BIN_NAME} PRIVATE
+    ${XCB_EWMH_LIBRARIES}
+    ${DFrameworkDBus_LIBRARIES}
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Concurrent_LIBRARIES}
+    ${Qt5X11Extras_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
+)
+
+# bin
+install(TARGETS ${BIN_NAME} DESTINATION bin)

frame/controller/dockpluginloader.cpp

@@ -33,7 +33,7 @@ DockPluginLoader::DockPluginLoader(QObject *parent)
 void DockPluginLoader::run()
 {
 #ifdef QT_DEBUG
-    const QDir pluginsDir("plugins");
+    const QDir pluginsDir("../plugins");
 #else
     const QDir pluginsDir("../lib/dde-dock/plugins");
 #endif

frame/environments.h.in

@@ -0,0 +1,6 @@
+#ifndef __ENVIRONMENTS_H_
+#define __ENVIRONMENTS_H_
+
+#define VERSION		"@VERSION@"
+
+#endif

frame/frame.pro

@@ -1,86 +0,0 @@
-
-include(../interfaces/interfaces.pri)
-
-QT      += core gui gui-private widgets dbus x11extras svg
-
-TARGET          = dde-dock
-DESTDIR         = $$_PRO_FILE_PWD_/../
-TEMPLATE        = app
-CONFIG         += c++11 link_pkgconfig
-
-PKGCONFIG += xcb-ewmh dtkwidget x11 dframeworkdbus
-LIBS += -lgomp
-
-SOURCES += main.cpp \
-    window/mainwindow.cpp \
-    xcb/xcb_misc.cpp \
-    item/dockitem.cpp \
-    panel/mainpanel.cpp \
-    controller/dockitemcontroller.cpp \
-    dbus/dbusdisplay.cpp \
-    item/appitem.cpp \
-    util/docksettings.cpp \
-    dbus/dbusclientmanager.cpp \
-    dbus/dbusdock.cpp \
-    util/themeappicon.cpp \
-    item/launcheritem.cpp \
-    dbus/dbusmenumanager.cpp \
-    dbus/dbusmenu.cpp \
-    item/pluginsitem.cpp \
-    controller/dockpluginscontroller.cpp \
-    util/imagefactory.cpp \
-    util/dockpopupwindow.cpp \
-    item/stretchitem.cpp \
-    item/placeholderitem.cpp \
-    controller/dockpluginloader.cpp \
-    item/containeritem.cpp \
-    item/components/containerwidget.cpp \
-    dbus/dbusdockadaptors.cpp \
-    item/components/appsnapshot.cpp \
-    item/components/floatingpreview.cpp \
-    item/components/previewcontainer.cpp \
-    item/components/hoverhighlighteffect.cpp
-
-HEADERS  += \
-    window/mainwindow.h \
-    xcb/xcb_misc.h \
-    item/dockitem.h \
-    panel/mainpanel.h \
-    controller/dockitemcontroller.h \
-    dbus/dbusdisplay.h \
-    item/appitem.h \
-    util/docksettings.h \
-    dbus/dbusclientmanager.h \
-    dbus/dbusdock.h \
-    util/themeappicon.h \
-    item/launcheritem.h \
-    dbus/dbusmenumanager.h \
-    dbus/dbusmenu.h \
-    item/pluginsitem.h \
-    controller/dockpluginscontroller.h \
-    util/imagefactory.h \
-    util/dockpopupwindow.h \
-    item/stretchitem.h \
-    item/placeholderitem.h \
-    controller/dockpluginloader.h \
-    item/containeritem.h \
-    item/components/containerwidget.h \
-    dbus/dbusdockadaptors.h \
-    item/components/appsnapshot.h \
-    item/components/floatingpreview.h \
-    item/components/previewcontainer.h \
-    item/components/hoverhighlighteffect.h
-
-dbus_service.files += com.deepin.dde.Dock.service
-dbus_service.path = /usr/share/dbus-1/services
-
-headers.files 	+= ../interfaces/constants.h \
-		../interfaces/pluginproxyinterface.h \
-		../interfaces/pluginsiteminterface.h
-headers.path	= /usr/include/dde-dock
-
-target.path = $${PREFIX}/bin/
-INSTALLS += target dbus_service headers
-
-RESOURCES += \
-    item/resources.qrc

plugins/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+add_subdirectory("datetime")
+#add_subdirectory("disk-mount")
+add_subdirectory("network")
+add_subdirectory("shutdown")
+add_subdirectory("sound")
+add_subdirectory("system-tray")
+#add_subdirectory("trash")

plugins/datetime/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+set(PLUGIN_NAME "datetime")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/datetime/datetime.pro

@@ -1,25 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       +=
-
-TARGET          = $$qtLibraryTarget(datetime)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += datetime.json
-
-HEADERS += \
-    datetimeplugin.h \
-    datetimewidget.h
-
-SOURCES += \
-    datetimeplugin.cpp \
-    datetimewidget.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources.qrc

plugins/disk-mount/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+set(PLUGIN_NAME "disk-mount")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/disk-mount/dbus/variant/diskinfo.h

@@ -25,7 +25,6 @@
 #include <QString>
 #include <QDataStream>
 #include <QDebug>
-#include <QtDBus>
 
 class DiskInfo
 {

plugins/disk-mount/disk-mount.pro

@@ -1,35 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg dbus
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += dtkwidget
-
-TARGET          = $$qtLibraryTarget(disk-mount)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += disk-mount.json
-
-HEADERS += \
-    diskmountplugin.h \
-    dbus/dbusdiskmount.h \
-    dbus/variant/diskinfo.h \
-    diskcontrolwidget.h \
-    diskpluginitem.h \
-    imageutil.h \
-    diskcontrolitem.h
-
-SOURCES += \
-    diskmountplugin.cpp \
-    dbus/dbusdiskmount.cpp \
-    dbus/variant/diskinfo.cpp \
-    diskcontrolwidget.cpp \
-    diskpluginitem.cpp \
-    imageutil.cpp \
-    diskcontrolitem.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources.qrc

plugins/network/CMakeLists.txt

@@ -0,0 +1,28 @@
+
+set(PLUGIN_NAME "network")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB_RECURSE SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
+                                                 ${Qt5DBus_INCLUDE_DIRS}
+                                                 ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/network/network.pro

@@ -1,48 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg dbus
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += dtkwidget
-
-TARGET          = $$qtLibraryTarget(network)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += network.json
-
-HEADERS += \
-    networkplugin.h \
-    item/wireditem.h \
-    dbus/dbusnetwork.h \
-    networkmanager.h \
-    networkdevice.h \
-    util/imageutil.h \
-    item/deviceitem.h \
-    item/wirelessitem.h \
-    item/applet/wirelessapplet.h \
-    item/applet/devicecontrolwidget.h \
-    item/applet/accesspoint.h \
-    item/applet/accesspointwidget.h \
-    item/applet/horizontalseperator.h
-
-SOURCES += \
-    networkplugin.cpp \
-    item/wireditem.cpp \
-    dbus/dbusnetwork.cpp \
-    networkmanager.cpp \
-    networkdevice.cpp \
-    util/imageutil.cpp \
-    item/deviceitem.cpp \
-    item/wirelessitem.cpp \
-    item/applet/wirelessapplet.cpp \
-    item/applet/devicecontrolwidget.cpp \
-    item/applet/accesspoint.cpp \
-    item/applet/accesspointwidget.cpp \
-    item/applet/horizontalseperator.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources.qrc
-

plugins/plugin-guide/home_monitor/home_monitor.pro

@@ -1,24 +0,0 @@
-
-QT              += widgets
-TEMPLATE         = lib
-CONFIG          += plugin c++11
-
-TARGET          = $$qtLibraryTarget(home_monitor)
-DESTDIR          = $$_PRO_FILE_PWD_
-DISTFILES       += home_monitor.json
-
-HEADERS += \
-    homemonitorplugin.h \
-    informationwidget.h
-
-SOURCES += \
-    homemonitorplugin.cpp \
-    informationwidget.cpp
-
-isEmpty(PREFIX) {
-    PREFIX = /usr
-}
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-

plugins/plugins.pro

@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
-        datetime \
-        shutdown \
-        system-tray \
-        #disk-mount \
-        network \
-        #trash \
-        sound

plugins/shutdown/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+set(PLUGIN_NAME "shutdown")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB_RECURSE SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/shutdown/shutdown.pro

@@ -1,31 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       +=
-
-TARGET          = $$qtLibraryTarget(shutdown)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += shutdown.json
-
-HEADERS += \
-    shutdownplugin.h \
-    dbus/dbuspower.h \
-    pluginwidget.h \
-    powerstatuswidget.h \
-    dbus/dbusaccount.h
-
-SOURCES += \
-    shutdownplugin.cpp \
-    dbus/dbuspower.cpp \
-    pluginwidget.cpp \
-    powerstatuswidget.cpp \
-    dbus/dbusaccount.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources.qrc

plugins/sound/CMakeLists.txt

@@ -0,0 +1,32 @@
+
+set(PLUGIN_NAME "sound")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB_RECURSE SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
+pkg_check_modules(QGSettings REQUIRED gsettings-qt)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS})
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
+                                                 ${DFrameworkDBus_INCLUDE_DIRS}
+                                                 ${QGSettings_INCLUDE_DIRS}
+                                                 ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${DFrameworkDBus_LIBRARIES}
+    ${QGSettings_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/sound/sound.pro

@@ -1,39 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg dbus
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += gsettings-qt dtkwidget
-
-TARGET          = $$qtLibraryTarget(sound)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += sound.json
-
-HEADERS += \
-    soundplugin.h \
-    sounditem.h \
-    soundapplet.h \
-    dbus/dbusaudio.h \
-    dbus/dbussink.h \
-    componments/horizontalseparator.h \
-    componments/volumeslider.h \
-    dbus/dbussinkinput.h \
-    sinkinputwidget.h
-
-SOURCES += \
-    soundplugin.cpp \
-    sounditem.cpp \
-    soundapplet.cpp \
-    dbus/dbusaudio.cpp \
-    dbus/dbussink.cpp \
-    componments/horizontalseparator.cpp \
-    componments/volumeslider.cpp \
-    dbus/dbussinkinput.cpp \
-    sinkinputwidget.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources/resources.qrc

plugins/system-tray/CMakeLists.txt

@@ -0,0 +1,34 @@
+
+set(PLUGIN_NAME "system-tray")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB_RECURSE SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst xcb-icccm)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
+                                                 ${Qt5DBus_INCLUDE_DIRS}
+                                                 ${XCB_LIBS_INCLUDE_DIRS}
+                                                 ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5X11Extras_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+    ${XCB_LIBS_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/system-tray/system-tray.pro

@@ -1,39 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets gui core dbus x11extras svg
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += xcb xcb-image xcb-icccm xcb-composite xtst
-
-TARGET          = $$qtLibraryTarget(system-tray)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += system-tray.json
-
-isEqual(DOCK_TRAY_USE_NATIVE_POPUP, YES) {
-    DEFINES += DOCK_TRAY_USE_NATIVE_POPUP
-}
-
-HEADERS += \
-    systemtrayplugin.h \
-    dbus/dbustraymanager.h \
-    fashiontrayitem.h \
-    tipswidget.h \
-    xwindowtraywidget.h \
-    indicatortraywidget.h \
-    abstracttraywidget.h
-
-SOURCES += \
-    systemtrayplugin.cpp \
-    dbus/dbustraymanager.cpp \
-    fashiontrayitem.cpp \
-    tipswidget.cpp \
-    xwindowtraywidget.cpp \
-    indicatortraywidget.cpp \
-    abstracttraywidget.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \
-    resources.qrc

plugins/trash/CMakeLists.txt

@@ -0,0 +1,32 @@
+
+set(PLUGIN_NAME "trash")
+
+project(${PLUGIN_NAME})
+
+# Sources files
+file(GLOB SRCS "*.h" "*.cpp")
+
+find_package(PkgConfig REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
+
+add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_library(${PLUGIN_NAME} SHARED ${SRCS})
+set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
+                                                 ${DFrameworkDBus_INCLUDE_DIRS}
+                                                 ${Qt5DBus_INCLUDE_DIRS}
+                                                 ../../interfaces)
+target_link_libraries(${PLUGIN_NAME} PRIVATE
+    ${DtkWidget_LIBRARIES}
+    ${DFrameworkDBus_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5DBus_LIBRARIES}
+    ${Qt5Svg_LIBRARIES}
+)
+
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins)

plugins/trash/trash.pro

@@ -1,26 +0,0 @@
-
-include(../../interfaces/interfaces.pri)
-
-QT              += widgets svg dbus
-TEMPLATE         = lib
-CONFIG          += plugin c++11 link_pkgconfig
-PKGCONFIG       += dtkwidget dframeworkdbus
-
-TARGET          = $$qtLibraryTarget(trash)
-DESTDIR          = $$_PRO_FILE_PWD_/../
-DISTFILES       += trash.json
-
-HEADERS += \
-    trashplugin.h \
-    trashwidget.h \
-    popupcontrolwidget.h
-
-SOURCES += \
-    trashplugin.cpp \
-    trashwidget.cpp \
-    popupcontrolwidget.cpp
-
-target.path = $${PREFIX}/lib/dde-dock/plugins/
-INSTALLS += target
-
-RESOURCES += \