cleanup and homogenize oxygen CMakeLists files.
Use KF5:: and Qt5:: consistently.
This commit is contained in:
parent
7ab317095d
commit
c4a4407139
3 changed files with 24 additions and 59 deletions
|
@ -23,20 +23,14 @@ set(kwin_oxygen_SRCS
|
|||
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
|
||||
KF5::KStyle # KStyle
|
||||
${Qt5Widgets_LIBRARIES}
|
||||
${Qt5X11Extras_LIBRARIES}
|
||||
${X11_X11_LIB}
|
||||
${XCB_XCB_LIBRARIES}
|
||||
kdecorations
|
||||
oxygenstyle
|
||||
)
|
||||
target_link_libraries(kwin3_oxygen Qt5::Widgets )
|
||||
target_link_libraries(kwin3_oxygen KF5::KConfigWidgets KF5::KGuiAddons KF5::KI18n KF5::KWindowSystem KF5::KStyle)
|
||||
target_link_libraries(kwin3_oxygen kdecorations oxygenstyle)
|
||||
|
||||
if(X11_FOUND)
|
||||
target_link_libraries(kwin3_oxygen ${X11_X11_LIB} ${XCB_XCB_LIBRARIES})
|
||||
target_link_libraries(kwin3_oxygen Qt5::X11Extras)
|
||||
endif()
|
||||
|
||||
install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
||||
|
|
|
@ -26,29 +26,13 @@ add_library(kwin_oxygen_config
|
|||
${kwin_oxygen_config_PART_SRCS}
|
||||
${kwin_oxygen_config_PART_FORMS_HEADERS})
|
||||
|
||||
target_link_libraries(kwin_oxygen_config
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt5::X11Extras
|
||||
Qt5::DBus)
|
||||
|
||||
target_link_libraries(kwin_oxygen_config
|
||||
${KConfig_LIBRARIES}
|
||||
${KCompletion_LIBRARIES}
|
||||
${KGuiAddons_LIBRARIES}
|
||||
${KWindowSystem_LIBRARIES}
|
||||
${KI18n_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(kwin_oxygen_config
|
||||
kdecorations
|
||||
oxygenstyle
|
||||
oxygenstyleconfig
|
||||
)
|
||||
target_link_libraries(kwin_oxygen_config Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus)
|
||||
target_link_libraries(kwin_oxygen_config KF5::KConfigCore KF5::KConfigGui KF5::KCompletion KF5::KGuiAddons KF5::KWindowSystem KF5::KI18n)
|
||||
target_link_libraries(kwin_oxygen_config kdecorations oxygenstyle oxygenstyleconfig)
|
||||
|
||||
if(X11_FOUND)
|
||||
target_link_libraries(kwin_oxygen_config ${X11_LIBRARIES})
|
||||
target_link_libraries(kwin_oxygen_config Qt5::X11Extras)
|
||||
endif()
|
||||
|
||||
install(TARGETS kwin_oxygen_config DESTINATION ${QT_PLUGIN_INSTALL_DIR}/kf5)
|
||||
|
|
|
@ -10,23 +10,10 @@ 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
|
||||
)
|
||||
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 KF5::KI18n KF5::KConfigWidgets)
|
||||
target_link_libraries(oxygen-shadow-demo oxygenstyle )
|
||||
|
||||
if(X11_FOUND)
|
||||
|
|
Loading…
Reference in a new issue