From fb4508c6a75d3e448e319ffb2a30500549563da3 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 6 Apr 2019 22:01:36 +0300 Subject: [PATCH] simplify CMakeLists --- app/CMakeLists.txt | 45 ++++++------------------ app/indicator/CMakeLists.txt | 5 +++ app/layout/CMakeLists.txt | 8 +++++ app/package/CMakeLists.txt | 5 +++ app/plasma/extended/CMakeLists.txt | 6 ++++ app/settings/CMakeLists.txt | 7 ++++ app/settings/delegates/CMakeLists.txt | 9 +++++ app/shortcuts/CMakeLists.txt | 7 ++++ app/view/CMakeLists.txt | 16 +++++++++ app/view/settings/CMakeLists.txt | 5 +++ app/wm/CMakeLists.txt | 8 +++++ liblatte2/CMakeLists.txt | 4 +-- liblatte2/plasma/extended/CMakeLists.txt | 6 ++++ 13 files changed, 95 insertions(+), 36 deletions(-) create mode 100644 app/indicator/CMakeLists.txt create mode 100644 app/layout/CMakeLists.txt create mode 100644 app/package/CMakeLists.txt create mode 100644 app/plasma/extended/CMakeLists.txt create mode 100644 app/settings/CMakeLists.txt create mode 100644 app/settings/delegates/CMakeLists.txt create mode 100644 app/shortcuts/CMakeLists.txt create mode 100644 app/view/CMakeLists.txt create mode 100644 app/view/settings/CMakeLists.txt create mode 100644 app/wm/CMakeLists.txt create mode 100644 liblatte2/plasma/extended/CMakeLists.txt diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 504de74f3..4421b34c4 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -9,43 +9,20 @@ set(lattedock-app_SRCS layoutmanager.cpp schemecolors.cpp screenpool.cpp - indicator/factory.cpp - layout/abstractlayout.cpp - layout/activelayout.cpp - layout/genericlayout.cpp - layout/storage.cpp - package/lattepackage.cpp - plasma/extended/screenpool.cpp - plasma/extended/theme.cpp - settings/settingsdialog.cpp - settings/universalsettings.cpp - settings/delegates/activitycmbboxdelegate.cpp - settings/delegates/checkboxdelegate.cpp - settings/delegates/colorcmbboxdelegate.cpp - settings/delegates/colorcmbboxitemdelegate.cpp - settings/delegates/layoutnamedelegate.cpp - shortcuts/globalshortcuts.cpp - shortcuts/modifiertracker.cpp - shortcuts/shortcutstracker.cpp - view/contextmenu.cpp - view/effects.cpp - view/indicator.cpp - view/indicatorinfo.cpp - view/panelshadows.cpp - view/positioner.cpp - view/screenedgeghostwindow.cpp - view/view.cpp - view/visibilitymanager.cpp - view/windowstracker.cpp - view/settings/primaryconfigview.cpp - view/settings/secondaryconfigview.cpp - wm/abstractwindowinterface.cpp - wm/waylandinterface.cpp - wm/windowinfowrap.cpp - wm/xwindowinterface.cpp main.cpp ) +add_subdirectory(indicator) +add_subdirectory(layout) +add_subdirectory(package) +add_subdirectory(plasma/extended) +add_subdirectory(settings) +add_subdirectory(settings/delegates) +add_subdirectory(shortcuts) +add_subdirectory(view) +add_subdirectory(view/settings) +add_subdirectory(wm) + set(latte_dbusXML dbus/org.kde.LatteDock.xml) qt5_add_dbus_adaptor(lattedock-app_SRCS ${latte_dbusXML} lattecorona.h Latte::Corona lattedockadaptor) ki18n_wrap_ui(lattedock-app_SRCS settings/settingsdialog.ui) diff --git a/app/indicator/CMakeLists.txt b/app/indicator/CMakeLists.txt new file mode 100644 index 000000000..ffa4e0090 --- /dev/null +++ b/app/indicator/CMakeLists.txt @@ -0,0 +1,5 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/factory.cpp + PARENT_SCOPE +) diff --git a/app/layout/CMakeLists.txt b/app/layout/CMakeLists.txt new file mode 100644 index 000000000..c84ce55ab --- /dev/null +++ b/app/layout/CMakeLists.txt @@ -0,0 +1,8 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/abstractlayout.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/activelayout.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/genericlayout.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/storage.cpp + PARENT_SCOPE +) diff --git a/app/package/CMakeLists.txt b/app/package/CMakeLists.txt new file mode 100644 index 000000000..2ca78ac23 --- /dev/null +++ b/app/package/CMakeLists.txt @@ -0,0 +1,5 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/lattepackage.cpp + PARENT_SCOPE +) diff --git a/app/plasma/extended/CMakeLists.txt b/app/plasma/extended/CMakeLists.txt new file mode 100644 index 000000000..0120e9397 --- /dev/null +++ b/app/plasma/extended/CMakeLists.txt @@ -0,0 +1,6 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/screenpool.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/theme.cpp + PARENT_SCOPE +) diff --git a/app/settings/CMakeLists.txt b/app/settings/CMakeLists.txt new file mode 100644 index 000000000..065a21116 --- /dev/null +++ b/app/settings/CMakeLists.txt @@ -0,0 +1,7 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/settingsdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/universalsettings.cpp + PARENT_SCOPE +) + diff --git a/app/settings/delegates/CMakeLists.txt b/app/settings/delegates/CMakeLists.txt new file mode 100644 index 000000000..4111a615b --- /dev/null +++ b/app/settings/delegates/CMakeLists.txt @@ -0,0 +1,9 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/activitycmbboxdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/checkboxdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/colorcmbboxitemdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/layoutnamedelegate.cpp + PARENT_SCOPE +) diff --git a/app/shortcuts/CMakeLists.txt b/app/shortcuts/CMakeLists.txt new file mode 100644 index 000000000..e9bd552ef --- /dev/null +++ b/app/shortcuts/CMakeLists.txt @@ -0,0 +1,7 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/globalshortcuts.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/modifiertracker.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/shortcutstracker.cpp + PARENT_SCOPE +) diff --git a/app/view/CMakeLists.txt b/app/view/CMakeLists.txt new file mode 100644 index 000000000..b7511c780 --- /dev/null +++ b/app/view/CMakeLists.txt @@ -0,0 +1,16 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/contextmenu.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/effects.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/indicator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/indicatorinfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/panelshadows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/positioner.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/screenedgeghostwindow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/view.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/visibilitymanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/windowstracker.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/primaryconfigview.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/secondaryconfigview.cpp + PARENT_SCOPE +) diff --git a/app/view/settings/CMakeLists.txt b/app/view/settings/CMakeLists.txt new file mode 100644 index 000000000..ce26e1973 --- /dev/null +++ b/app/view/settings/CMakeLists.txt @@ -0,0 +1,5 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/primaryconfigview.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/secondaryconfigview.cpp +) diff --git a/app/wm/CMakeLists.txt b/app/wm/CMakeLists.txt new file mode 100644 index 000000000..58d52791c --- /dev/null +++ b/app/wm/CMakeLists.txt @@ -0,0 +1,8 @@ +set(lattedock-app_SRCS + ${lattedock-app_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/abstractwindowinterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/waylandinterface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/windowinfowrap.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/xwindowinterface.cpp + PARENT_SCOPE +) diff --git a/liblatte2/CMakeLists.txt b/liblatte2/CMakeLists.txt index e6012e29e..759c4f008 100644 --- a/liblatte2/CMakeLists.txt +++ b/liblatte2/CMakeLists.txt @@ -7,10 +7,10 @@ set(latteplugin_SRCS iconitem.cpp quickwindowsystem.cpp types.cpp - plasma/extended/backgroundcache.cpp - plasma/extended/screenpool.cpp ) +add_subdirectory(plasma/extended) + add_library(latte2plugin SHARED ${latteplugin_SRCS}) target_link_libraries(latte2plugin diff --git a/liblatte2/plasma/extended/CMakeLists.txt b/liblatte2/plasma/extended/CMakeLists.txt new file mode 100644 index 000000000..cdf8bc06c --- /dev/null +++ b/liblatte2/plasma/extended/CMakeLists.txt @@ -0,0 +1,6 @@ +set(latteplugin_SRCS + ${latteplugin_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/backgroundcache.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/screenpool.cpp + PARENT_SCOPE +)