mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
generic: stop using kdeinit for main applications
This commit is contained in:
Ivailo Monev
parent
dac64a054a
commit
3ef94d4d1a
30 changed files with 108 additions and 146 deletions
|
|
@ -1,26 +1,24 @@
|
|||
########### next target ###############
|
||||
|
||||
set(kcminit_KDEINIT_SRCS main.cpp)
|
||||
set(kcminit_SRCS main.cpp)
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable( kcminit ${kcminit_KDEINIT_SRCS})
|
||||
kde4_add_executable(kcminit ${kcminit_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kcminit ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
|
||||
target_link_libraries(kcminit ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
|
||||
|
||||
install(TARGETS kdeinit_kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
########### next target ###############
|
||||
|
||||
# TODO might be simpler to make <whatever>_startup to be a symlink to <whatever>
|
||||
|
||||
set(kcminit_startup_KDEINIT_SRCS main.cpp)
|
||||
set(kcminit_startup_SRCS main.cpp)
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable( kcminit_startup ${kcminit_startup_KDEINIT_SRCS})
|
||||
kde4_add_executable( kcminit_startup ${kcminit_startup_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kcminit_startup ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
|
||||
target_link_libraries(kcminit_startup ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
|
||||
|
||||
install(TARGETS kdeinit_kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ void KCMInit::runPhase2()
|
|||
qApp->exit( 0 );
|
||||
}
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
// kdeinit waits for kcminit to finish, but during KDE startup
|
||||
// only important kcm's are started very early in the login process,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
|
||||
set(kcmshell_KDEINIT_SRCS main.cpp )
|
||||
set(kcmshell_SRCS main.cpp )
|
||||
|
||||
kde4_add_kdeinit_executable( kcmshell4 ${kcmshell_KDEINIT_SRCS})
|
||||
kde4_add_executable( kcmshell4 ${kcmshell_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kcmshell4 ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} )
|
||||
target_link_libraries(kcmshell4 ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} )
|
||||
|
||||
install(TARGETS kdeinit_kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(TARGETS kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ void KCMShell::appExit(const QString &appId, const QString &oldName, const QStri
|
|||
}
|
||||
}
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
|
||||
int main(int _argc, char *_argv[])
|
||||
{
|
||||
KAboutData aboutData( "kcmshell", 0, ki18n("KDE Control Module"),
|
||||
KDE_VERSION_STRING,
|
||||
|
|
|
|||
|
|
@ -16,14 +16,13 @@ install(TARGETS kcm_access DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
########### next target ###############
|
||||
|
||||
set(kaccess_KDEINIT_SRCS kaccess.cpp main.cpp )
|
||||
set(kaccess_SRCS kaccess.cpp main.cpp )
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable( kaccess ${kaccess_KDEINIT_SRCS})
|
||||
kde4_add_executable( kaccess ${kaccess_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_LIBRARIES})
|
||||
target_link_libraries(kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_LIBRARIES})
|
||||
|
||||
install(TARGETS kdeinit_kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
#include <kaboutdata.h>
|
||||
#include <kcmdlineargs.h>
|
||||
#include <klocale.h>
|
||||
extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
|
||||
|
||||
int main(int argc, char * argv[] )
|
||||
{
|
||||
KAboutData about(I18N_NOOP("kaccess"), 0, ki18n("KDE Accessibility Tool"),
|
||||
0, KLocalizedString(), KAboutData::License_GPL,
|
||||
|
|
|
|||
|
|
@ -31,15 +31,13 @@ if ( Q_WS_QWS )
|
|||
set( kglobalaccel_SRCS ${kglobalaccel_SRCS} kglobalaccel_qws.cpp )
|
||||
endif ( Q_WS_QWS )
|
||||
|
||||
kde4_add_kdeinit_executable( kglobalaccel NOGUI ${kglobalaccel_SRCS} )
|
||||
target_link_libraries(kdeinit_kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
|
||||
kde4_add_executable( kglobalaccel NOGUI ${kglobalaccel_SRCS} )
|
||||
target_link_libraries(kglobalaccel ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
|
||||
if(Q_WS_MAC)
|
||||
target_link_libraries(kdeinit_kglobalaccel ${CARBON_LIBRARY})
|
||||
target_link_libraries(kglobalaccel ${CARBON_LIBRARY})
|
||||
endif(Q_WS_MAC)
|
||||
target_link_libraries(kglobalaccel kdeinit_kglobalaccel)
|
||||
|
||||
# Install application and configuration
|
||||
install( TARGETS kdeinit_kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install( TARGETS kglobalaccel ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
# install( FILES kglobalaccel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
|
||||
install( FILES kglobalaccel.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ static void sighandler(int /*sig*/)
|
|||
}
|
||||
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
// Disable Session Management the right way (C)
|
||||
//
|
||||
|
|
|
|||
|
|
@ -30,20 +30,19 @@ kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps
|
|||
kde4_add_ui_files(libklipper_common_SRCS generalconfig.ui actionsconfig.ui editactiondialog.ui)
|
||||
kde4_add_kcfg_files(libklipper_common_SRCS klippersettings.kcfgc)
|
||||
|
||||
set(klipper_KDEINIT_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp)
|
||||
set(klipper_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp)
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS})
|
||||
kde4_add_executable(klipper ${klipper_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_klipper ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${ZLIB_LIBRARY})
|
||||
target_link_libraries(klipper ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${ZLIB_LIBRARY})
|
||||
if (X11_Xfixes_FOUND)
|
||||
target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
|
||||
target_link_libraries(klipper ${X11_Xfixes_LIB})
|
||||
endif (X11_Xfixes_FOUND)
|
||||
if (PRISON_FOUND)
|
||||
target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
|
||||
target_link_libraries(klipper ${PRISON_LIBRARIES})
|
||||
endif (PRISON_FOUND)
|
||||
|
||||
install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
install(PROGRAMS klipper.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include "tray.h"
|
||||
#include "klipper.h"
|
||||
|
||||
extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
Klipper::createAboutData();
|
||||
KCmdLineArgs::init( argc, argv, Klipper::aboutData());
|
||||
|
|
|
|||
|
|
@ -11,15 +11,12 @@ qt4_add_dbus_interface(
|
|||
${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml
|
||||
khotkeys_interface)
|
||||
|
||||
set(kmenuedit_KDEINIT_SRCS main.cpp ${kmenueditcommon_STAT_SRCS})
|
||||
set(kmenuedit_SRCS main.cpp ${kmenueditcommon_STAT_SRCS})
|
||||
|
||||
kde4_add_kdeinit_executable( kmenuedit ${kmenuedit_KDEINIT_SRCS})
|
||||
kde4_add_executable(kmenuedit ${kmenuedit_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kmenuedit ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY})
|
||||
target_link_libraries(kmenuedit ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY})
|
||||
|
||||
install(TARGETS kdeinit_kmenuedit DESTINATION ${LIB_INSTALL_DIR} )
|
||||
|
||||
target_link_libraries( kmenuedit kdeinit_kmenuedit )
|
||||
install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
########### install files ###############
|
||||
|
|
@ -27,7 +24,7 @@ install(TARGETS kmenuedit ${INSTALL_TARGETS_DEFAULT_ARGS})
|
|||
install( PROGRAMS kmenuedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
install( FILES kmenueditui.rc DESTINATION ${DATA_INSTALL_DIR}/kmenuedit )
|
||||
|
||||
add_dependencies(kdeinit_kmenuedit kded_khotkeys)
|
||||
add_dependencies(kmenuedit kded_khotkeys)
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public:
|
|||
};
|
||||
|
||||
|
||||
extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
KAboutData aboutData("kmenuedit", 0, ki18n("KDE Menu Editor"),
|
||||
version, ki18n(description), KAboutData::License_GPL,
|
||||
|
|
|
|||
|
|
@ -50,21 +50,22 @@ set(krunner_SRCS
|
|||
ksystemactivitydialog.cpp
|
||||
startupid.cpp)
|
||||
|
||||
kde4_add_kdeinit_executable(krunner ${krunner_SRCS})
|
||||
kde4_add_executable(krunner ${krunner_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_krunner kworkspace plasmagenericshell ${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} )
|
||||
|
||||
target_link_libraries(kdeinit_krunner processui ${X11_Xrender_LIB} ${X11_LIBRARIES})
|
||||
target_link_libraries(krunner kworkspace plasmagenericshell processui
|
||||
${KDE4_PLASMA_LIBS} ${KDE4_SOLID_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KCMUTILS_LIBS} ${X11_Xrender_LIB}
|
||||
${X11_LIBRARIES})
|
||||
|
||||
if(X11_Xss_LIB)
|
||||
target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
|
||||
target_link_libraries(krunner ${X11_Xss_LIB})
|
||||
endif(X11_Xss_LIB)
|
||||
|
||||
if(X11_Xcursor_FOUND)
|
||||
target_link_libraries(kdeinit_krunner ${X11_Xcursor_LIB})
|
||||
target_link_libraries(krunner ${X11_Xcursor_LIB})
|
||||
endif(X11_Xcursor_FOUND)
|
||||
|
||||
install(TARGETS kdeinit_krunner ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS krunner ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
install(FILES krunner.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -36,8 +36,7 @@
|
|||
|
||||
static const char description[] = I18N_NOOP( "KDE run command interface" );
|
||||
|
||||
extern "C"
|
||||
KDE_EXPORT int kdemain(int argc, char* argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
#ifdef Q_WS_X11
|
||||
// krunner only works properly with Qt's native X11 backend; override any compile-time
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmse
|
|||
|
||||
########### next target ###############
|
||||
|
||||
set(ksmserver_KDEINIT_SRCS
|
||||
set(ksmserver_SRCS
|
||||
main.cpp
|
||||
server.cpp
|
||||
shutdowndlg.cpp
|
||||
|
|
@ -41,7 +41,7 @@ set(kcminit_xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCMinit.xml)
|
|||
add_custom_command(OUTPUT ${kcminit_xml}
|
||||
COMMAND ${QT_DBUSCPP2XML_EXECUTABLE} ${kcminit_adaptor} > ${kcminit_xml}
|
||||
DEPENDS ${kcminit_adaptor})
|
||||
qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${kcminit_xml} kcminit_interface )
|
||||
qt4_add_dbus_interface( ksmserver_SRCS ${kcminit_xml} kcminit_interface )
|
||||
|
||||
# This is actually now disabled, because OrgKDEKlauncherInterface is also provided
|
||||
# by kdecore, it is not autogenerated and is not binary compatible with a currently
|
||||
|
|
@ -49,19 +49,17 @@ qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${kcminit_xml} kcminit_interface
|
|||
# This should be fixed for KDE5.
|
||||
# KLauchner.xml is installed by kdelibs, so it is in KDE4_DBUS_INTERFACES_DIR
|
||||
# set(klauncher_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KLauncher.xml)
|
||||
# qt4_add_dbus_interface( ksmserver_KDEINIT_SRCS ${klauncher_xml} klauncher_interface )
|
||||
# qt4_add_dbus_interface( ksmserver_SRCS ${klauncher_xml} klauncher_interface )
|
||||
|
||||
qt4_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml server.h KSMServer )
|
||||
qt4_add_dbus_adaptor( ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer )
|
||||
|
||||
kde4_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS})
|
||||
kde4_add_executable( ksmserver ${ksmserver_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_ksmserver ${SCREEN_LOCKER} ${KDE4_PLASMA_LIBS} kworkspace
|
||||
target_link_libraries(ksmserver ${SCREEN_LOCKER} ${KDE4_PLASMA_LIBS} kworkspace
|
||||
${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB}
|
||||
${QT_QTDECLARATIVE_LIBRARY} ${KDECLARATIVE_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS kdeinit_ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
install(TARGETS ksmserver ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ void sanity_check( int argc, char* argv[], KAboutData* aboutDataPtr )
|
|||
}
|
||||
}
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
|
||||
int main( int argc, char* argv[] )
|
||||
{
|
||||
KAboutData aboutData( "ksmserver", 0, ki18n("The KDE Session Manager"),
|
||||
version, ki18n(description), KAboutData::License_BSD,
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ kde4_add_ui_files( libsensordisplays_SRCS
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/SensorDisplayLib/SensorLoggerSettingsWidget.ui
|
||||
)
|
||||
|
||||
set(ksysguard_KDEINIT_SRCS ${libsensordisplays_SRCS}
|
||||
set(ksysguard_SRCS ${libsensordisplays_SRCS}
|
||||
ksortfilterproxymodel.cpp
|
||||
SensorBrowser.cpp
|
||||
WorkSheet.cpp
|
||||
|
|
@ -52,11 +52,10 @@ set(ksysguard_KDEINIT_SRCS ${libsensordisplays_SRCS}
|
|||
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable(ksysguard ${ksysguard_KDEINIT_SRCS})
|
||||
kde4_add_executable(ksysguard ${ksysguard_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_ksysguard processui ksignalplotter ${KDE4_KIO_LIBS} ksgrd)
|
||||
target_link_libraries(ksysguard processui ksignalplotter ${KDE4_KIO_LIBS} ksgrd)
|
||||
|
||||
install(TARGETS kdeinit_ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(TARGETS ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ void TopLevel::setSwapInfo( qlonglong used, qlonglong free, const QString & )
|
|||
/*
|
||||
* Once upon a time...
|
||||
*/
|
||||
extern "C" KDE_EXPORT int kdemain( int argc, char** argv )
|
||||
int main( int argc, char** argv )
|
||||
{
|
||||
// initpipe is used to keep the parent process around till the child
|
||||
// has registered with dbus
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ include_directories( ${KDE4_KIO_INCLUDES} )
|
|||
# for dbus_add_activation_service
|
||||
include(MacroDBusAddActivationService)
|
||||
|
||||
set(kuiserver_KDEINIT_SRCS
|
||||
set(kuiserver_SRCS
|
||||
main.cpp
|
||||
uiserver.cpp
|
||||
jobview.cpp
|
||||
|
|
@ -20,7 +20,7 @@ progresslistdelegate_p.h
|
|||
uiserver_p.h
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kuiserver_KDEINIT_SRCS configdialog.ui)
|
||||
kde4_add_ui_files(kuiserver_SRCS configdialog.ui)
|
||||
|
||||
|
||||
#<DBus Stuff>
|
||||
|
|
@ -28,21 +28,21 @@ kde4_add_ui_files(kuiserver_KDEINIT_SRCS configdialog.ui)
|
|||
#<JobView>
|
||||
set(jobview_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.JobViewV2.xml)
|
||||
|
||||
qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor )
|
||||
qt4_add_dbus_adaptor(kuiserver_SRCS ${jobview_xml} jobview.h JobView jobviewadaptor )
|
||||
|
||||
qt4_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobview_xml} jobview_interface )
|
||||
qt4_add_dbus_interface(kuiserver_SRCS ${jobview_xml} jobview_interface )
|
||||
#</JobView>
|
||||
|
||||
|
||||
#<JobViewServer>
|
||||
set(jobviewserver_xml ${KDE4_DBUS_INTERFACES_DIR}/org.kde.JobViewServer.xml)
|
||||
|
||||
qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} progresslistmodel.h ProgressListModel jobviewserveradaptor )
|
||||
qt4_add_dbus_adaptor(kuiserver_SRCS ${jobviewserver_xml} progresslistmodel.h ProgressListModel jobviewserveradaptor )
|
||||
|
||||
qt4_add_dbus_interface(kuiserver_KDEINIT_SRCS ${jobviewserver_xml} jobviewserver_interface )
|
||||
qt4_add_dbus_interface(kuiserver_SRCS ${jobviewserver_xml} jobviewserver_interface )
|
||||
#</JobViewServer>
|
||||
|
||||
qt4_add_dbus_adaptor(kuiserver_KDEINIT_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor )
|
||||
qt4_add_dbus_adaptor(kuiserver_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor )
|
||||
|
||||
|
||||
dbus_add_activation_service(org.kde.kuiserver.service.in)
|
||||
|
|
@ -50,21 +50,12 @@ dbus_add_activation_service(org.kde.kuiserver.service.in)
|
|||
#</DBus Stuff>
|
||||
|
||||
|
||||
kde4_add_kcfg_files(kuiserver_KDEINIT_SRCS kuiserversettings.kcfgc)
|
||||
kde4_add_kcfg_files(kuiserver_SRCS kuiserversettings.kcfgc)
|
||||
|
||||
kde4_add_kdeinit_executable( kuiserver ${kuiserver_KDEINIT_SRCS})
|
||||
kde4_add_executable( kuiserver ${kuiserver_SRCS})
|
||||
|
||||
if (Q_WS_MAC)
|
||||
set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template)
|
||||
set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kuiserver")
|
||||
set_target_properties(kuiserver PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE UI Server")
|
||||
endif (Q_WS_MAC)
|
||||
target_link_libraries(kuiserver ${KDE4_KIO_LIBS} )
|
||||
|
||||
|
||||
target_link_libraries(kdeinit_kuiserver ${KDE4_KIO_LIBS} )
|
||||
install(TARGETS kdeinit_kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
target_link_libraries( kuiserver kdeinit_kuiserver )
|
||||
install(TARGETS kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
install( FILES kuiserver.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include <kdebug.h>
|
||||
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
// GS 5/2001 - I changed the name to "KDE" to make it look better
|
||||
// in the titles of dialogs which are displayed.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend)
|
|||
|
||||
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=285)
|
||||
|
||||
set(kwalletd_KDEINIT_SRCS
|
||||
set(kwalletd_SRCS
|
||||
main.cpp
|
||||
kbetterthankdialog.cpp
|
||||
kwalletd.cpp
|
||||
|
|
@ -29,7 +29,7 @@ set(kwalletd_KDEINIT_SRCS
|
|||
kwalletsessionstore.cpp
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kwalletd_KDEINIT_SRCS
|
||||
kde4_add_ui_files(kwalletd_SRCS
|
||||
kbetterthankdialogbase.ui
|
||||
kwalletwizardpageexplanation.ui
|
||||
kwalletwizardpageintro.ui
|
||||
|
|
@ -38,11 +38,11 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS
|
|||
)
|
||||
|
||||
if (GPGME_FOUND AND QGPGME_FOUND)
|
||||
set(kwalletd_KDEINIT_SRCS
|
||||
${kwalletd_KDEINIT_SRCS}
|
||||
set(kwalletd_SRCS
|
||||
${kwalletd_SRCS}
|
||||
knewwalletdialog.cpp
|
||||
)
|
||||
kde4_add_ui_files(kwalletd_KDEINIT_SRCS
|
||||
kde4_add_ui_files(kwalletd_SRCS
|
||||
kwalletwizardpagepasswordgpg.ui
|
||||
kwalletwizardpagegpgkey.ui
|
||||
knewwalletdialogintro.ui
|
||||
|
|
@ -52,18 +52,15 @@ endif(GPGME_FOUND AND QGPGME_FOUND)
|
|||
|
||||
find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
|
||||
|
||||
qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
|
||||
qt4_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD )
|
||||
|
||||
kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
|
||||
kde4_add_executable( kwalletd NOGUI ${kwalletd_SRCS} )
|
||||
|
||||
target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
|
||||
target_link_libraries(kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
|
||||
if (GPGME_FOUND AND QGPGME_FOUND)
|
||||
target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
|
||||
target_link_libraries(kwalletd ${QGPGME_LIBRARIES} )
|
||||
endif(GPGME_FOUND AND QGPGME_FOUND)
|
||||
|
||||
install(TARGETS kdeinit_kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
target_link_libraries(kwalletd kdeinit_kwalletd)
|
||||
install(TARGETS kwalletd ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ char* checkPamModule(int argc, char **argv)
|
|||
return hash;
|
||||
}
|
||||
|
||||
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
char *hash = NULL;
|
||||
if (getenv("PAM_KWALLET_LOGIN")) {
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ add_subdirectory( tabbox )
|
|||
|
||||
########### next target ###############
|
||||
|
||||
set(kwin_KDEINIT_SRCS
|
||||
set(kwin_SRCS
|
||||
workspace.cpp
|
||||
dbusinterface.cpp
|
||||
client.cpp
|
||||
|
|
@ -135,7 +135,7 @@ set(kwin_KDEINIT_SRCS
|
|||
|
||||
if(KWIN_BUILD_TABBOX)
|
||||
set(
|
||||
kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
|
||||
kwin_SRCS ${kwin_SRCS}
|
||||
tabbox/tabbox.cpp
|
||||
tabbox/clientmodel.cpp
|
||||
tabbox/declarative.cpp
|
||||
|
|
@ -148,34 +148,34 @@ endif()
|
|||
|
||||
if(KWIN_BUILD_SCREENEDGES)
|
||||
set(
|
||||
kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
|
||||
kwin_SRCS ${kwin_SRCS}
|
||||
screenedge.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
if(KWIN_BUILD_KAPPMENU)
|
||||
set(
|
||||
kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
|
||||
kwin_SRCS ${kwin_SRCS}
|
||||
appmenu.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
if(KWIN_HAVE_EGL)
|
||||
set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} eglonxbackend.cpp)
|
||||
set(kwin_SRCS ${kwin_SRCS} eglonxbackend.cpp)
|
||||
endif()
|
||||
|
||||
kde4_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc)
|
||||
kde4_add_kcfg_files(kwin_SRCS settings.kcfgc)
|
||||
|
||||
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface )
|
||||
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor )
|
||||
qt4_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )
|
||||
qt4_add_dbus_adaptor( kwin_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface )
|
||||
qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Compositing.xml composite.h KWin::Compositor )
|
||||
qt4_add_dbus_adaptor( kwin_SRCS org.kde.kwin.Effects.xml effects.h KWin::EffectsHandlerImpl )
|
||||
|
||||
qt4_add_dbus_interface( kwin_KDEINIT_SRCS
|
||||
qt4_add_dbus_interface( kwin_SRCS
|
||||
${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml ksmserver_interface)
|
||||
qt4_add_dbus_interface( kwin_KDEINIT_SRCS
|
||||
qt4_add_dbus_interface( kwin_SRCS
|
||||
${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml screenlocker_interface)
|
||||
|
||||
qt4_add_resources( kwin_KDEINIT_SRCS resources.qrc )
|
||||
qt4_add_resources( kwin_SRCS resources.qrc )
|
||||
|
||||
########### target link libraries ###############
|
||||
|
||||
|
|
@ -241,38 +241,34 @@ set(kwinLibs
|
|||
${kwin_OPENGL_LIBS}
|
||||
)
|
||||
|
||||
kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
|
||||
kde4_add_executable( kwin ${kwin_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kwin ${kwinLibs})
|
||||
target_link_libraries(kwin ${kwinLibs})
|
||||
set_target_properties(kwin PROPERTIES OUTPUT_NAME ${KWIN_NAME})
|
||||
set_target_properties(kdeinit_kwin PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME})
|
||||
|
||||
if(OPENGL_FOUND)
|
||||
if( KWIN_BUILD_OPENGL_1_COMPOSITING )
|
||||
set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
|
||||
set_target_properties(kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
|
||||
endif()
|
||||
add_subdirectory(opengltest)
|
||||
target_link_libraries(kdeinit_kwin kwinglutils ${OPENGL_gl_LIBRARY})
|
||||
target_link_libraries(kwin kwinglutils ${OPENGL_gl_LIBRARY})
|
||||
# -ldl used by OpenGL code
|
||||
find_library(DL_LIBRARY dl)
|
||||
if (DL_LIBRARY)
|
||||
target_link_libraries(kdeinit_kwin ${DL_LIBRARY})
|
||||
target_link_libraries(kwin ${DL_LIBRARY})
|
||||
endif()
|
||||
elseif(OPENGLES_FOUND)
|
||||
target_link_libraries(kdeinit_kwin ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES})
|
||||
set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
|
||||
target_link_libraries(kwin ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES})
|
||||
set_target_properties(kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
|
||||
endif()
|
||||
|
||||
install(TARGETS kdeinit_kwin ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
if(OPENGLES_FOUND)
|
||||
kde4_add_kdeinit_executable( kwin_gles ${kwin_KDEINIT_SRCS})
|
||||
target_link_libraries(kdeinit_kwin_gles ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES})
|
||||
set_target_properties(kdeinit_kwin_gles PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
|
||||
kde4_add_executable( kwin_gles ${kwin_SRCS})
|
||||
target_link_libraries(kwin_gles ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES})
|
||||
set_target_properties(kwin_gles PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
|
||||
set_target_properties(kwin_gles PROPERTIES OUTPUT_NAME ${KWIN_NAME}_gles)
|
||||
set_target_properties(kdeinit_kwin_gles PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME}_gles)
|
||||
install(TARGETS kdeinit_kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -7,18 +7,17 @@ set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp ${
|
|||
|
||||
kde4_add_ui_files(kwinrules_SRCS ruleslist.ui detectwidget.ui editshortcut.ui ruleswidgetbase.ui)
|
||||
|
||||
set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS})
|
||||
set(kwin_rules_dialog_SRCS main.cpp ${kwinrules_SRCS})
|
||||
|
||||
kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
|
||||
kde4_add_executable( kwin_rules_dialog ${kwin_rules_dialog_SRCS})
|
||||
|
||||
set(kwin_kcm_rules_XCB_LIBS
|
||||
${XCB_XCB_LIBRARIES}
|
||||
${X11_XCB_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS})
|
||||
target_link_libraries(kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${kwin_kcm_rules_XCB_LIBS})
|
||||
|
||||
install(TARGETS kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR} )
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
|||
|
|
@ -238,8 +238,7 @@ static int edit(Window wid, bool whole_app)
|
|||
|
||||
} // namespace
|
||||
|
||||
extern "C"
|
||||
KDE_EXPORT int kdemain(int argc, char* argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
KCmdLineArgs::init(argc, argv, "kwin_rules_dialog", "kcmkwinrules", ki18n("KWin"), "1.0" ,
|
||||
ki18n("KWin helper utility"));
|
||||
|
|
|
|||
|
|
@ -459,8 +459,7 @@ void Application::resetCrashesCount()
|
|||
static const char version[] = KWIN_VERSION_STRING;
|
||||
static const char description[] = I18N_NOOP("KDE window manager");
|
||||
|
||||
extern "C"
|
||||
KDE_EXPORT int kdemain(int argc, char * argv[])
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
#ifdef M_TRIM_THRESHOLD
|
||||
// Prevent fragmentation of the heap by malloc (glibc).
|
||||
|
|
|
|||
|
|
@ -37,21 +37,18 @@ qt4_add_dbus_interface(plasma_SRCS ${ksmserver_xml} ksmserver_interface)
|
|||
|
||||
kde4_add_app_icon(plasma_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/plasma.png")
|
||||
|
||||
kde4_add_kdeinit_executable(plasma-desktop ${plasma_SRCS})
|
||||
kde4_add_executable(plasma-desktop ${plasma_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY})
|
||||
target_link_libraries(plasma-desktop ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIDLETIME_LIBS} ${QT_QTSCRIPT_LIBRARY} kworkspace plasmagenericshell ${QT_QTDECLARATIVE_LIBRARY})
|
||||
|
||||
if(UNIX AND Q_WS_X11)
|
||||
target_link_libraries(kdeinit_plasma-desktop ${X11_LIBRARIES})
|
||||
target_link_libraries(plasma-desktop ${X11_LIBRARIES} kephal)
|
||||
|
||||
if(X11_Xrender_FOUND)
|
||||
target_link_libraries(kdeinit_plasma-desktop ${X11_Xrender_LIB})
|
||||
target_link_libraries(plasma-desktop ${X11_Xrender_LIB})
|
||||
endif(X11_Xrender_FOUND)
|
||||
endif(UNIX AND Q_WS_X11)
|
||||
|
||||
target_link_libraries(kdeinit_plasma-desktop kephal)
|
||||
|
||||
install(TARGETS kdeinit_plasma-desktop DESTINATION ${LIB_INSTALL_DIR})
|
||||
install(TARGETS plasma-desktop ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(FILES data/plasma.desktop data/plasma-desktop.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
|
||||
install(FILES data/plasma-shell-desktop.kcfg DESTINATION ${KCFG_INSTALL_DIR})
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@
|
|||
static const char description[] = I18N_NOOP( "The KDE desktop, panels and widgets workspace application." );
|
||||
QString plasmaLocale;
|
||||
|
||||
extern "C"
|
||||
KDE_EXPORT int kdemain(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "START" << "(line:" << __LINE__ << ")";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,9 @@ set(plasma-windowed_SRCS
|
|||
)
|
||||
|
||||
|
||||
kde4_add_kdeinit_executable(plasma-windowed ${plasma-windowed_SRCS})
|
||||
kde4_add_executable(plasma-windowed ${plasma-windowed_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_plasma-windowed ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} )
|
||||
target_link_libraries(plasma-windowed ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} )
|
||||
|
||||
|
||||
install(TARGETS kdeinit_plasma-windowed DESTINATION ${LIB_INSTALL_DIR})
|
||||
install(TARGETS plasma-windowed ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
static const char description[] = I18N_NOOP( "Shell used to load Plasma widgets as stand-alone applications." );
|
||||
static const char version[] = "0.1";
|
||||
|
||||
extern "C"
|
||||
KDE_EXPORT int kdemain(int argc, char **argv)
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
KAboutData aboutData("plasma-windowed", 0, ki18n("Plasma Widgets shell"),
|
||||
version, ki18n(description), KAboutData::License_GPL,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue