diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index 2a8d711a7..18cc1c49d 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,45 +1,45 @@ ########### add version number into compilation defines # FIXME: CPACK_PACKAGE_VERSION_* are empty add_definitions (-DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") add_definitions( -DHAVE_X11=${X11_FOUND} ) add_subdirectory(config) add_subdirectory(demo) add_subdirectory(data) include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen) ########### next target ############### set(kwin_oxygen_SRCS oxygenbutton.cpp oxygenclient.cpp oxygenclientgroupitemdata.cpp oxygendecohelper.cpp oxygenexceptionlist.cpp oxygenfactory.cpp oxygensizegrip.cpp oxygentitleanimationdata.cpp ) kde4_add_kcfg_files(kwin_oxygen_SRCS oxygenconfiguration.kcfgc ) kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS}) target_link_libraries( kwin3_oxygen KF5::KConfigWidgets KF5::KGuiAddons KF5::KI18n KF5::KWindowSystem - ${KDE4_KDEUI_LIBRARY} # KStyle + KF5::KStyle # KStyle ${Qt5Widgets_LIBRARIES} ${Qt5X11Extras_LIBRARIES} ${X11_X11_LIB} ${XCB_XCB_LIBRARIES} kdecorations oxygenstyle ) install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES oxygenclient.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) diff --git a/clients/oxygen/demo/CMakeLists.txt b/clients/oxygen/demo/CMakeLists.txt index df6aeccc2..fc6877be2 100644 --- a/clients/oxygen/demo/CMakeLists.txt +++ b/clients/oxygen/demo/CMakeLists.txt @@ -1,35 +1,36 @@ include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen) ########### next target ############### set(oxygen_shadow_demo_SOURCES oxygenshadowdemodialog.cpp oxygenshadowdemowidget.cpp main.cpp) set(oxygen_shadow_demo_FORMS ui/oxygenshadowdemo.ui) qt5_wrap_ui(oxygen_shadow_demo_FORMS_HEADERS ${oxygen_shadow_demo_FORMS} ) add_executable(oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES} ${oxygen_shadow_demo_FORMS_HEADERS} ) target_link_libraries(oxygen-shadow-demo Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus ) target_link_libraries(oxygen-shadow-demo ${KI18n_LIBRARIES} + KF5::KConfigWidgets ) target_link_libraries(oxygen-shadow-demo oxygenstyle ) if(X11_FOUND) target_link_libraries(oxygen-shadow-demo ${X11_LIBRARIES} ) endif() install(TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS} )