diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 4f74aa69f..e12d770d7 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -30,11 +30,14 @@ set(lattedock-app_SRCS add_executable(latte-dock ${lattedock-app_SRCS}) +include(FakeTarget.cmake) + target_link_libraries( latte-dock Qt5::Widgets Qt5::Quick Qt5::Qml + Qt5::X11Extras KF5::I18n KF5::CoreAddons KF5::XmlGui @@ -43,6 +46,7 @@ target_link_libraries( KF5::QuickAddons KF5::DBusAddons KF5::Notifications + KF5::WindowSystem ) install(TARGETS latte-dock ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/FakeTarget.cmake b/app/FakeTarget.cmake similarity index 74% rename from FakeTarget.cmake rename to app/FakeTarget.cmake index a42dac188..e2127ae35 100644 --- a/FakeTarget.cmake +++ b/app/FakeTarget.cmake @@ -1,13 +1,13 @@ -execute_process(COMMAND find shell containment plasmoid -name "*.qml" -o -name "*.js" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +execute_process(COMMAND find ../shell ../containment ../plasmoid -name "*.qml" -o -name "*.js" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE QML_SRCS_STRING) string(REPLACE "\n" ";" QML_SRCS ${QML_SRCS_STRING}) # fake target for QtCreator project add_custom_target(fake-target - SOURCES ${QML_SRCS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + SOURCES ${QML_SRCS}) # qmllint: qml static syntax checker if(${CMAKE_BUILD_TYPE} MATCHES "Debug") @@ -15,9 +15,9 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Debug") if(EXISTS "${QMLLINT}") message("-- Found qmllint: ${QMLLINT}") - add_custom_command(TARGET candil PRE_BUILD + add_custom_command(TARGET latte-dock PRE_BUILD COMMAND ${QMLLINT} ${QML_SRCS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running qmllint") else() message("-- qmllint: QML Syntax verifier not found")