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

re-enabled compilation of the 'config' code

Browse source
This commit is contained in:
Hugo Pereira Da Costa 2013-08-01 19:31:47 +02:00
parent 70553ce8a2
commit e261b3b20c
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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_subdirectory( config ) add_subdirectory( config )
# add_subdirectory( demo ) # add_subdirectory( demo )
add_subdirectory( data ) add_subdirectory( data )

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

@ -11,25 +11,45 @@ set(kwin_oxygen_config_PART_SRCS
../oxygenexceptionlist.cpp ../oxygenexceptionlist.cpp
) )
kde4_add_ui_files(kwin_oxygen_config_PART_SRCS kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc )
set( kwin_oxygen_config_PART_FORMS
ui/oxygenconfigurationui.ui ui/oxygenconfigurationui.ui
ui/oxygendetectwidget.ui ui/oxygendetectwidget.ui
ui/oxygenexceptiondialog.ui ui/oxygenexceptiondialog.ui
ui/oxygenexceptionlistwidget.ui ui/oxygenexceptionlistwidget.ui
) )
kde4_add_kcfg_files(kwin_oxygen_config_PART_SRCS ../oxygenconfiguration.kcfgc ) qt5_wrap_ui(kwin_oxygen_config_PART_FORMS_HEADERS ${kwin_oxygen_config_PART_FORMS})
kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS}) add_library(kwin_oxygen_config
${kwin_oxygen_config_PART_SRCS}
${kwin_oxygen_config_PART_FORMS_HEADERS})
target_link_libraries( target_link_libraries(kwin_oxygen_config
kwin_oxygen_config Qt5::Core
${KDE4_KDEUI_LIBS} Qt5::Gui
${QT_QTGUI_LIBRARY} Qt5::Widgets
${X11_X11_LIB} Qt5::X11Extras
Qt5::DBus)
target_link_libraries(kwin_oxygen_config
${KConfig_LIBRARIES}
${KCompletion_LIBRARIES}
${KGuiAddons_LIBRARIES}
${KWidgets_LIBRARIES}
${KWindowSystem_LIBRARIES}
${KI18n_LIBRARIES}
)
target_link_libraries(kwin_oxygen_config
kdecorations kdecorations
oxygenstyle oxygenstyle
oxygenstyleconfig oxygenstyleconfig
) )
install(TARGETS kwin_oxygen_config DESTINATION ${PLUGIN_INSTALL_DIR} ) if(X11_FOUND)
target_link_libraries(kwin_oxygen_config ${X11_LIBRARIES} )
endif()
install(TARGETS kwin_oxygen_config DESTINATION ${QT_PLUGIN_INSTALL_DIR}/kf5 )