cleaning CMakeLists.txt

pull/1/head
Johan Smith Agudelo Rodriguez
parent 09629b774b
commit 6e37702a95

@ -19,13 +19,28 @@ find_package(ECM 1.8.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Quick X11Extras)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS Quick Qml)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Plasma PlasmaQuick WindowSystem Declarative
Plasma PlasmaQuick WindowSystem Declarative Activities
I18n CoreAddons XmlGui DBusAddons IconThemes Wayland)
find_package(X11 REQUIRED)
set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
URL "http://www.x.org"
TYPE OPTIONAL
PURPOSE "Required for building the X11 based workspace")
if(X11_FOUND)
find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
set_package_properties(XCB PROPERTIES TYPE REQUIRED)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
endif()
if(X11_FOUND AND XCB_XCB_FOUND)
set(HAVE_X11 true)
endif()
FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
@ -126,15 +141,12 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
add_subdirectory(app)
add_subdirectory(liblattedock)
add_subdirectory(shell)
add_subdirectory(containment)
plasma_install_package(build/containment/release org.kde.latte.containment)
add_subdirectory(plasmoid)
plasma_install_package(build/plasmoid/release org.kde.latte.plasmoid)
add_subdirectory(shell)
plasma_install_package(build/shell/release org.kde.latte.shell shells shell)
add_subdirectory(icons)
plasma_install_package(build/shell/release org.kde.latte.shell shells shell)
plasma_install_package(build/containment/release org.kde.latte.containment)
plasma_install_package(build/plasmoid/release org.kde.latte.plasmoid)

@ -9,30 +9,6 @@ include(ECMOptionalAddSubdirectory)
include(ECMQtDeclareLoggingCategory)
include(KDEPackageAppTemplates)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Quick Qml)
find_package(KF5I18n NO_MODULE)
find_package(KF5Activities REQUIRED)
find_package(X11 REQUIRED)
set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
URL "http://www.x.org"
TYPE OPTIONAL
PURPOSE "Required for building the X11 based workspace")
if(X11_FOUND)
find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
set_package_properties(XCB PROPERTIES TYPE REQUIRED)
if(NOT X11_SM_FOUND)
message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
endif(NOT X11_SM_FOUND)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
endif()
if(X11_FOUND AND XCB_XCB_FOUND)
set(HAVE_X11 true)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-latte.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-latte.h)
set(lattedock-app_SRCS
@ -51,8 +27,6 @@ set(lattedock-app_SRCS
main.cpp
)
#add_subdirectory(packageplugins)
add_executable(latte-dock ${lattedock-app_SRCS})
include(FakeTarget.cmake)

Loading…
Cancel
Save