yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup and homogenize oxygen CMakeLists files.

Browse source 
Use KF5:: and Qt5:: consistently.
This commit is contained in:
Hugo Pereira Da Costa 2013-08-07 11:42:23 +02:00
parent 7ab317095d
commit c4a4407139
3 changed files with 24 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
clients/oxygen/CMakeLists.txt
View file

@ -1,7 +1,7 @@
########### add version number into compilation defines ########### add version number into compilation defines
# FIXME: CPACK_PACKAGE_VERSION_* are empty # FIXME: CPACK_PACKAGE_VERSION_* are empty
add_definitions (-DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") add_definitions (-DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
add_definitions( -DHAVE_X11=${X11_FOUND} ) add_definitions(-DHAVE_X11=${X11_FOUND})
add_subdirectory(config) add_subdirectory(config)
add_subdirectory(demo) add_subdirectory(demo)
add_subdirectory(data) add_subdirectory(data)
@ -23,23 +23,17 @@ set(kwin_oxygen_SRCS
kde4_add_kcfg_files(kwin_oxygen_SRCS oxygenconfiguration.kcfgc ) kde4_add_kcfg_files(kwin_oxygen_SRCS oxygenconfiguration.kcfgc )
kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS}) kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS})
target_link_libraries( target_link_libraries(kwin3_oxygen Qt5::Widgets )
kwin3_oxygen target_link_libraries(kwin3_oxygen KF5::KConfigWidgets KF5::KGuiAddons KF5::KI18n KF5::KWindowSystem KF5::KStyle)
KF5::KConfigWidgets target_link_libraries(kwin3_oxygen kdecorations oxygenstyle)
KF5::KGuiAddons
KF5::KI18n
KF5::KWindowSystem
KF5::KStyle # KStyle
${Qt5Widgets_LIBRARIES}
${Qt5X11Extras_LIBRARIES}
${X11_X11_LIB}
${XCB_XCB_LIBRARIES}
kdecorations
oxygenstyle
)
install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR} ) 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})
########### install files ############### ########### install files ###############
install( FILES oxygenclient.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) install(FILES oxygenclient.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/)

30
clients/oxygen/config/CMakeLists.txt
View file

@ -11,7 +11,7 @@ set(kwin_oxygen_config_PART_SRCS
../oxygenexceptionlist.cpp ../oxygenexceptionlist.cpp
) )
kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc ) kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc)
set( kwin_oxygen_config_PART_FORMS set( kwin_oxygen_config_PART_FORMS
ui/oxygenconfigurationui.ui ui/oxygenconfigurationui.ui
@ -26,29 +26,13 @@ add_library(kwin_oxygen_config
${kwin_oxygen_config_PART_SRCS} ${kwin_oxygen_config_PART_SRCS}
${kwin_oxygen_config_PART_FORMS_HEADERS}) ${kwin_oxygen_config_PART_FORMS_HEADERS})
target_link_libraries(kwin_oxygen_config target_link_libraries(kwin_oxygen_config Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus)
Qt5::Core target_link_libraries(kwin_oxygen_config KF5::KConfigCore KF5::KConfigGui KF5::KCompletion KF5::KGuiAddons KF5::KWindowSystem KF5::KI18n)
Qt5::Gui target_link_libraries(kwin_oxygen_config kdecorations oxygenstyle oxygenstyleconfig)
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
)
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(kwin_oxygen_config ${X11_LIBRARIES} ) target_link_libraries(kwin_oxygen_config ${X11_LIBRARIES})
target_link_libraries(kwin_oxygen_config Qt5::X11Extras)
endif() endif()
install(TARGETS kwin_oxygen_config DESTINATION ${QT_PLUGIN_INSTALL_DIR}/kf5 ) install(TARGETS kwin_oxygen_config DESTINATION ${QT_PLUGIN_INSTALL_DIR}/kf5)

25
clients/oxygen/demo/CMakeLists.txt
View file

@ -8,29 +8,16 @@ set(oxygen_shadow_demo_SOURCES
set(oxygen_shadow_demo_FORMS ui/oxygenshadowdemo.ui) set(oxygen_shadow_demo_FORMS ui/oxygenshadowdemo.ui)
qt5_wrap_ui(oxygen_shadow_demo_FORMS_HEADERS ${oxygen_shadow_demo_FORMS} ) qt5_wrap_ui(oxygen_shadow_demo_FORMS_HEADERS ${oxygen_shadow_demo_FORMS})
add_executable(oxygen-shadow-demo add_executable(oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES} ${oxygen_shadow_demo_FORMS_HEADERS})
${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 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 ) target_link_libraries(oxygen-shadow-demo oxygenstyle )
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(oxygen-shadow-demo ${X11_LIBRARIES} ) target_link_libraries(oxygen-shadow-demo ${X11_LIBRARIES})
endif() endif()
install(TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS oxygen-shadow-demo ${INSTALL_TARGETS_DEFAULT_ARGS})