fix(build): fix CMakeLists merge error (#772)

fix CMakelists error and use find_pacakge Dwayland
fix archlinux build dep

log:

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.16)
 
 if (NOT DEFINED VERSION)
     set(VERSION 4.0)

archlinux/PKGBUILD

@@ -11,7 +11,8 @@ depends=('qt5-svg' 'deepin-daemon-git' 'deepin-qt5integration-git'
 makedepends=('git' 'cmake' 'ninja' 'qt5-tools' 'gtest' 'gmock' 
              'dtkcommon-git' 'dtkcore-git' 'deepin-qt5integration-git'
              'deepin-qt-dbus-factory' 'libdbusmenu-qt5'
-             'deepin-control-center-git')
+             'deepin-control-center-git' 'dwayland-git' 'extra-cmake-modules'
+            )
 conflicts=('deepin-dock')
 provides=('deepin-dock')
 optdepends=('deepin-network-core-git')

debian/control

@@ -29,7 +29,8 @@ Build-Depends: debhelper (>= 8.0.0),
  libqt5waylandclient5-dev,
  qtwayland5-private-dev,
  libxdamage-dev,
- libdwayland-dev
+ libdwayland-dev,
+ extra-cmake-modules
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org/
 

frame/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.16)
 
 set(BIN_NAME dde-dock)
 
@@ -23,16 +23,19 @@ find_package(Qt5DBus REQUIRED)
 find_package(Qt5Svg REQUIRED)
 find_package(Qt5WaylandClient REQUIRED)
 find_package(Qt5XkbCommonSupport REQUIRED)
+find_package(DtkGui REQUIRED)
 find_package(DtkWidget REQUIRED)
 find_package(DtkCMake REQUIRED)
 find_package(dbusmenu-qt5 REQUIRED)
+find_package(ECM REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+find_package(DWayland REQUIRED)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb-image xcb-ewmh xcb-composite xtst x11 dbusmenu-qt5 xext xcursor)
-pkg_check_modules(QGSettings REQUIRED gsettings-qt)
-pkg_check_modules(DtkGUI REQUIRED dtkgui)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
 
-set(Wayland_INCLUDE_DIRS /usr/include/DWayland/Client)
-set(Wayland_LIBRARIES /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/libDWaylandClient.so)
+pkg_check_modules(XCB_EWMH REQUIRED IMPORTED_TARGET xcb-image xcb-ewmh xcb-composite xtst x11 dbusmenu-qt5 xext xcursor)
+pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
 
 # driver-manager
 add_executable(${BIN_NAME}
@@ -50,7 +53,6 @@ target_include_directories(${BIN_NAME} PUBLIC
     ${DtkGUI_INCLUDE_DIRS}
     ${Qt5Svg_INCLUDE_DIRS}
     ${dbusmenu-qt5_INCLUDE_DIRS}
-    ${Wayland_INCLUDE_DIRS}
     ${Qt5WaylandClient_INCLUDE_DIRS}
     ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
     ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
@@ -86,21 +88,21 @@ target_include_directories(${BIN_NAME} PUBLIC
 )
 
 target_link_libraries(${BIN_NAME} PRIVATE
-    ${XCB_EWMH_LIBRARIES}
     ${DtkWidget_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
-    ${Qt5Gui_LIBRARIES}
-    ${Qt5Concurrent_LIBRARIES}
-    ${Qt5X11Extras_LIBRARIES}
-    ${Qt5DBus_LIBRARIES}
-    ${QGSettings_LIBRARIES}
-    ${DtkGUI_LIBRARIES}
-    ${Qt5Svg_LIBRARIES}
-    ${Wayland_LIBRARIES}
-    ${Qt5Wayland_LIBRARIES}
-    ${Qt5WaylandClient_LIBRARIES}
-    ${Qt5XkbCommonSupport_LIBRARIES}
-    -lpthread -lm
+    PkgConfig::QGSettings
+    PkgConfig::XCB_EWMH
+    Dtk::Gui
+    Qt5::Widgets
+    Qt5::Gui
+    Qt5::Concurrent
+    Qt5::X11Extras
+    Qt5::DBus
+    Qt5::Svg
+    Qt5::WaylandClient
+    Qt5::XkbCommonSupport
+    DWaylandClient
+    Threads::Threads
+    -lm
 )
 
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64")
@@ -116,4 +118,4 @@ if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
 endif()
 
 # bin
-install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

frame/screenspliter/screenspliter_wayland.cpp

@@ -17,13 +17,13 @@
 #include <private/qwaylandcursor_p.h>
 #undef private
 
-#include <registry.h>
-#include <ddeshell.h>
-#include <event_queue.h>
-#include <plasmashell.h>
-#include <compositor.h>
-#include <clientmanagement.h>
-#include <connection_thread.h>
+#include <DWayland/Client/registry.h>
+#include <DWayland/Client/ddeshell.h>
+#include <DWayland/Client/event_queue.h>
+#include <DWayland/Client/plasmashell.h>
+#include <DWayland/Client/compositor.h>
+#include <DWayland/Client/clientmanagement.h>
+#include <DWayland/Client/connection_thread.h>
 
 SplitWindowManager *ScreenSpliter_Wayland::m_splitManager = nullptr;
 

plugins/plugin-guide/home_monitor/CMakeLists.txt

@@ -4,7 +4,7 @@
 # https://cmake.org/cmake/help/latest/
 
 # 设置运行该脚本所需的 cmake 最低版本
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 # 使用 set 命令设置一个变量
 set(PLUGIN_NAME "home_monitor")

plugins/plugin-guide/plugins-developer-guide.md

@@ -124,7 +124,7 @@ home_monitor
 # https://cmake.org/cmake/help/latest/
 
 # 设置运行被配置所需的 cmake 最低版本
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.16)
 
 # 使用 set 命令设置一个变量
 set(PLUGIN_NAME "home_monitor")

tests/CMakeLists.txt

@@ -1,6 +1,6 @@
 ADD_COMPILE_OPTIONS(-fno-access-control)
 
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.16)
 
 set(BIN_NAME dde_dock_unit_test)