From d4155deb8d425efa01e2d2e9332ecfe4f12ccb9c Mon Sep 17 00:00:00 2001 From: gregory guy Date: Wed, 30 Jan 2019 11:42:53 +0100 Subject: [PATCH] conversion to the cmake building system Signed-off-by: gregory guy --- CMakeLists.txt | 83 +++++++++++++++++++++ ConfigureChecks.cmake | 44 ++++++++++++ config.h.cmake | 8 +++ doc/CMakeLists.txt | 1 + doc/de/CMakeLists.txt | 1 + doc/kshutdown/CMakeLists.txt | 1 + doc/man/CMakeLists.txt | 5 ++ doc/man/kshutdown.1 | 115 ++++++++++++++++++++++++++++++ extras/CMakeLists.txt | 8 +++ extras/multimedia/CMakeLists.txt | 6 ++ extras/shutdown/CMakeLists.txt | 6 ++ extras/system/CMakeLists.txt | 6 ++ karamba/CMakeLists.txt | 8 +++ kshutdown/CMakeLists.txt | 57 +++++++++++++++ kshutdown/actions.cpp | 5 +- kshutdown/appobserver.cpp | 9 +-- kshutdown/appobserver.h | 2 +- kshutdown/extras.cpp | 3 +- kshutdown/extras.h | 4 +- kshutdown/kshutdowniface_skel.cpp | 2 +- kshutdown/links.cpp | 7 +- kshutdown/links.h | 2 +- kshutdown/mactioneditdialog.cpp | 17 ++--- kshutdown/main.cpp | 2 +- kshutdown/miscutils.cpp | 6 +- kshutdown/miscutils.h | 2 +- kshutdown/mmainwindow.cpp | 19 ++--- kshutdown/mmainwindow.h | 2 +- kshutdown/mmessagedialog.cpp | 13 ++-- kshutdown/msettingsdialog.cpp | 23 +++--- kshutdown/mstatstab.cpp | 15 ++-- kshutdown/msystemtray.cpp | 3 +- kshutdown/mtip.cpp | 2 +- kshutdown/progressbar.cpp | 7 +- kshutdown/progressbar.h | 2 +- kshutdown/systemconfig.cpp | 5 +- kshutdownlockout/CMakeLists.txt | 35 +++++++++ kshutdownlockout/lockout.cpp | 7 +- pics/CMakeLists.txt | 1 + po/CMakeLists.txt | 5 ++ sounds/CMakeLists.txt | 13 ++++ 41 files changed, 489 insertions(+), 73 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 ConfigureChecks.cmake create mode 100644 config.h.cmake create mode 100644 doc/CMakeLists.txt create mode 100644 doc/de/CMakeLists.txt create mode 100644 doc/kshutdown/CMakeLists.txt create mode 100644 doc/man/CMakeLists.txt create mode 100644 doc/man/kshutdown.1 create mode 100644 extras/CMakeLists.txt create mode 100644 extras/multimedia/CMakeLists.txt create mode 100644 extras/shutdown/CMakeLists.txt create mode 100644 extras/system/CMakeLists.txt create mode 100644 karamba/CMakeLists.txt create mode 100644 kshutdown/CMakeLists.txt create mode 100644 kshutdownlockout/CMakeLists.txt create mode 100644 pics/CMakeLists.txt create mode 100644 po/CMakeLists.txt create mode 100644 sounds/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..17dcc6f --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,83 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( kshutdown ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_EXTRAS "Build extras" ${BUILD_ALL} ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( ${PROJECT_NAME} ) +add_subdirectory( kshutdownlockout ) +add_subdirectory( karamba ) +add_subdirectory( sounds ) +add_subdirectory( pics ) +tde_conditional_add_subdirectory( BUILD_EXTRAS extras ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..dfd13ad --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,44 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + if( NOT UNIX ) + tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" ) + endif( NOT UNIX ) + set( __KDE_HAVE_GCC_VISIBILITY 1 ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") +endif( WITH_GCC_VISIBILITY ) + + +##### gettext + +if( BUILD_TRANSLATIONS ) + include( FindGettext ) + if( GETTEXT_FOUND ) + set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE} + CACHE FILEPATH "path to msgfmt executable" ) + endif( GETTEXT_FOUND ) + + if( NOT MSGFMT_EXECUTABLE ) + tde_message_fatal( "msgfmt is required but was not found on your system." ) + endif( NOT MSGFMT_EXECUTABLE ) +endif( BUILD_TRANSLATIONS ) diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..6d0aa9f --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1 @@ +tde_auto_add_subdirectories( ) diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt new file mode 100644 index 0000000..eca4bd4 --- /dev/null +++ b/doc/de/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de ) diff --git a/doc/kshutdown/CMakeLists.txt b/doc/kshutdown/CMakeLists.txt new file mode 100644 index 0000000..ba3ef3e --- /dev/null +++ b/doc/kshutdown/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/doc/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kshutdown.1 b/doc/man/kshutdown.1 new file mode 100644 index 0000000..46ff377 --- /dev/null +++ b/doc/man/kshutdown.1 @@ -0,0 +1,115 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KSHUTDOWN 1 "avril 14, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kshutdown \- A Shut Down Utility for TDE +.SH SYNOPSIS +.B kshutdown +.RI [ Qt-options ] +.RI [ TDE-options ] +.RI [ options ] +.RI time +.SH DESCRIPTION +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +This manual page documents briefly the +.B kshutdown +utility. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH OPTIONS +A summary of options is included below. + +.TP +Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-tde +Show TDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options + +.TP +Options: +.TP +.B \-s, \-\-shutdown + Turn off computer +.TP +.B \-h, \-\-halt +Turn off computer +.TP +.B \-r, \-\-reboot +Restart computer +.TP +.B \-k, \-\-lock +Lock session +.TP +.B \-l, \-\-logout +End current session +.TP +.B \-w, \-\-wizard +Wizard +.TP +.B \-\-standard +Show standard logout dialog +.TP +.B \-c, \-\-cancel +Cancel an active action +.TP +.B \-\-init +Don't show window at startup +.TP +.B \-\-test +Enable test mode +.TP +.B \-\-default +Disable test mode + +.TP +Arguments: +.TP +.B time +Time; Examples: 01:30 - absolute time (HH:MM); 10 - number of minutes to wait from now +.SH AUTHOR +kshutdown was written by Konrad Twardowski . +.PP +This manual page was written by Romain Beauxis , +for the Debian project Permission is granted to copy, distribute and/or +modify this document under the terms of the GNU General Public +License, Version 2 any later version published by the Free Software Foundation. + diff --git a/extras/CMakeLists.txt b/extras/CMakeLists.txt new file mode 100644 index 0000000..4645d0a --- /dev/null +++ b/extras/CMakeLists.txt @@ -0,0 +1,8 @@ +add_subdirectory( multimedia ) +add_subdirectory( shutdown ) +add_subdirectory( system ) + +install( + FILES hibernate.desktop + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/extras +) diff --git a/extras/multimedia/CMakeLists.txt b/extras/multimedia/CMakeLists.txt new file mode 100644 index 0000000..00173e8 --- /dev/null +++ b/extras/multimedia/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.desktop ) + +install( + FILES ${_files} .directory + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/extras/multimedia +) diff --git a/extras/shutdown/CMakeLists.txt b/extras/shutdown/CMakeLists.txt new file mode 100644 index 0000000..f6c8d32 --- /dev/null +++ b/extras/shutdown/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.desktop ) + +install( + FILES ${_files} .directory + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/extras/shutdown +) diff --git a/extras/system/CMakeLists.txt b/extras/system/CMakeLists.txt new file mode 100644 index 0000000..6e6e107 --- /dev/null +++ b/extras/system/CMakeLists.txt @@ -0,0 +1,6 @@ +file( GLOB _files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.desktop ) + +install( + FILES ${_files} .directory + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/extras/system +) diff --git a/karamba/CMakeLists.txt b/karamba/CMakeLists.txt new file mode 100644 index 0000000..0044281 --- /dev/null +++ b/karamba/CMakeLists.txt @@ -0,0 +1,8 @@ +install( + FILES + ${PROJECT_NAME}-48x48.png + ${PROJECT_NAME}-classic-notext.theme + ${PROJECT_NAME}-classic-text.theme + + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/karamba +) diff --git a/kshutdown/CMakeLists.txt b/kshutdown/CMakeLists.txt new file mode 100644 index 0000000..56c33bb --- /dev/null +++ b/kshutdown/CMakeLists.txt @@ -0,0 +1,57 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kshutdown (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + actions.cpp + appobserver.cpp + configuration.cpp + confirmation.cpp + extras.cpp + kshutdowniface_skel.cpp + links.cpp + mactioneditdialog.cpp + main.cpp + miscutils.cpp + mmainwindow.cpp + mmessagedialog.cpp + msettingsdialog.cpp + mstatstab.cpp + msystemtray.cpp + mtip.cpp + progressbar.cpp + systemconfig.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES ${PROJECT_NAME}.upd + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update +) + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${SHARE_INSTALL_PREFIX}/applications +) diff --git a/kshutdown/actions.cpp b/kshutdown/actions.cpp index 4b331e0..67da412 100644 --- a/kshutdown/actions.cpp +++ b/kshutdown/actions.cpp @@ -26,8 +26,8 @@ #include "msystemtray.h" #include "systemconfig.h" -#include -#include +#include +#include #include #include @@ -453,3 +453,4 @@ void Action::slotShutDown() { execConfirm(ShutDown); } +#include "actions.moc" diff --git a/kshutdown/appobserver.cpp b/kshutdown/appobserver.cpp index dc465b7..9518499 100644 --- a/kshutdown/appobserver.cpp +++ b/kshutdown/appobserver.cpp @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -288,3 +288,4 @@ void AppObserver::slotRefresh() { refresh(); } +#include "appobserver.moc" diff --git a/kshutdown/appobserver.h b/kshutdown/appobserver.h index dbfb321..885c31d 100644 --- a/kshutdown/appobserver.h +++ b/kshutdown/appobserver.h @@ -22,7 +22,7 @@ #include -#include +#include class TQComboBox; class TQProcess; diff --git a/kshutdown/extras.cpp b/kshutdown/extras.cpp index 1f398de..b729380 100644 --- a/kshutdown/extras.cpp +++ b/kshutdown/extras.cpp @@ -23,7 +23,7 @@ #include "miscutils.h" #include "mmainwindow.h" -#include +#include #include #include @@ -307,3 +307,4 @@ void Extras::slotShowMenu() buildMenu(_menu, *it); } } +#include "extras.moc" diff --git a/kshutdown/extras.h b/kshutdown/extras.h index 365b45c..98d1e48 100644 --- a/kshutdown/extras.h +++ b/kshutdown/extras.h @@ -20,8 +20,8 @@ #ifndef __EXTRAS_H__ #define __EXTRAS_H__ -#include -#include +#include +#include class TDEPopupMenu; class KPushButton; diff --git a/kshutdown/kshutdowniface_skel.cpp b/kshutdown/kshutdowniface_skel.cpp index e0b169b..9201637 100644 --- a/kshutdown/kshutdowniface_skel.cpp +++ b/kshutdown/kshutdowniface_skel.cpp @@ -9,7 +9,7 @@ #include "kshutdowniface.h" #include -#include +#include static const int KShutdownIface_fhash = 13; diff --git a/kshutdown/links.cpp b/kshutdown/links.cpp index 2c45e24..e2aab33 100644 --- a/kshutdown/links.cpp +++ b/kshutdown/links.cpp @@ -21,9 +21,9 @@ #include "links.h" #include "miscutils.h" -#include -#include -#include +#include +#include +#include #include #include @@ -208,3 +208,4 @@ void Links::slotAddRemoveLink() { } updateAddRemoveButton(); } +#include "links.moc" diff --git a/kshutdown/links.h b/kshutdown/links.h index 91bb756..1864171 100644 --- a/kshutdown/links.h +++ b/kshutdown/links.h @@ -20,7 +20,7 @@ #ifndef __LINKS_H__ #define __LINKS_H__ -#include +#include class KPushButton; class TQComboBox; diff --git a/kshutdown/mactioneditdialog.cpp b/kshutdown/mactioneditdialog.cpp index f826dce..0427932 100644 --- a/kshutdown/mactioneditdialog.cpp +++ b/kshutdown/mactioneditdialog.cpp @@ -22,14 +22,14 @@ #include "miscutils.h" #include "mtip.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -223,3 +223,4 @@ void MActionEditDialog::slotTestCommandBeforeAction() i_commandBeforeActionPause->value() ); } +#include "mactioneditdialog.moc" diff --git a/kshutdown/main.cpp b/kshutdown/main.cpp index 08a5dc8..098882a 100644 --- a/kshutdown/main.cpp +++ b/kshutdown/main.cpp @@ -24,7 +24,7 @@ #include "mmainwindow.h" #include "msystemtray.h" -#include +#include #include #include diff --git a/kshutdown/miscutils.cpp b/kshutdown/miscutils.cpp index 257e68a..3dd6885 100644 --- a/kshutdown/miscutils.cpp +++ b/kshutdown/miscutils.cpp @@ -24,9 +24,9 @@ #include "mmainwindow.h" #include "msystemtray.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/kshutdown/miscutils.h b/kshutdown/miscutils.h index a02c0f2..95960ae 100644 --- a/kshutdown/miscutils.h +++ b/kshutdown/miscutils.h @@ -20,7 +20,7 @@ #ifndef __MISCUTILS_H__ #define __MISCUTILS_H__ -#include +#include #include diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp index e030eb1..d780727 100644 --- a/kshutdown/mmainwindow.cpp +++ b/kshutdown/mmainwindow.cpp @@ -30,15 +30,15 @@ #include "progressbar.h" #include "systemconfig.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -952,3 +952,4 @@ bool MMainWindow::queryExit() return true; // ok to exit } +#include "mmainwindow.moc" diff --git a/kshutdown/mmainwindow.h b/kshutdown/mmainwindow.h index 5c2b0e1..792af9c 100644 --- a/kshutdown/mmainwindow.h +++ b/kshutdown/mmainwindow.h @@ -23,7 +23,7 @@ #include "actions.h" #include "kshutdowniface.h" -#include +#include #include diff --git a/kshutdown/mmessagedialog.cpp b/kshutdown/mmessagedialog.cpp index e4bd6ec..0305987 100644 --- a/kshutdown/mmessagedialog.cpp +++ b/kshutdown/mmessagedialog.cpp @@ -21,12 +21,12 @@ #include "mmainwindow.h" #include "mmessagedialog.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -182,3 +182,4 @@ void MMessageDialog::slotCheckTime() void MMessageDialog::slotReject() { done(Rejected); } +#include "mmessagedialog.moc" diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp index 95e2480..cf187ff 100644 --- a/kshutdown/msettingsdialog.cpp +++ b/kshutdown/msettingsdialog.cpp @@ -28,17 +28,17 @@ #include "mtip.h" #include "systemconfig.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -620,3 +620,4 @@ void MSettingsDialog::slotDefault() } _configDialogManager->updateWidgets(); } +#include "msettingsdialog.moc" diff --git a/kshutdown/mstatstab.cpp b/kshutdown/mstatstab.cpp index 635af2d..3cf277c 100644 --- a/kshutdown/mstatstab.cpp +++ b/kshutdown/mstatstab.cpp @@ -22,13 +22,13 @@ #include "miscutils.h" #include "mstatstab.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -194,3 +194,4 @@ void MStatsTab::slotRefresh() b_refresh->setEnabled(true); } } +#include "mstatstab.moc" diff --git a/kshutdown/msystemtray.cpp b/kshutdown/msystemtray.cpp index 7307611..de84c53 100644 --- a/kshutdown/msystemtray.cpp +++ b/kshutdown/msystemtray.cpp @@ -22,7 +22,7 @@ #include "mmainwindow.h" #include "msystemtray.h" -#include +#include #include #include @@ -210,3 +210,4 @@ void MSystemTray::slotFlashTimeout() if (_flashCount == 6) _flashTimer->stop(); } +#include "msystemtray.moc" diff --git a/kshutdown/mtip.cpp b/kshutdown/mtip.cpp index 5350b75..c865296 100644 --- a/kshutdown/mtip.cpp +++ b/kshutdown/mtip.cpp @@ -20,7 +20,7 @@ #include "miscutils.h" #include "mtip.h" -#include +#include #include diff --git a/kshutdown/progressbar.cpp b/kshutdown/progressbar.cpp index c78e331..cd412a9 100644 --- a/kshutdown/progressbar.cpp +++ b/kshutdown/progressbar.cpp @@ -17,9 +17,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include +#include +#include +#include #include #include @@ -151,3 +151,4 @@ void ProgressBar::slotSetBottomPosition() { void ProgressBar::slotSetTopPosition() { setPosition(TOP); } +#include "progressbar.moc" diff --git a/kshutdown/progressbar.h b/kshutdown/progressbar.h index f8e8f7f..af4a67d 100644 --- a/kshutdown/progressbar.h +++ b/kshutdown/progressbar.h @@ -20,7 +20,7 @@ #ifndef __PROGRESSBAR_H__ #define __PROGRESSBAR_H__ -#include +#include #include "progressbar.h" diff --git a/kshutdown/systemconfig.cpp b/kshutdown/systemconfig.cpp index b5f59a4..60cfb99 100644 --- a/kshutdown/systemconfig.cpp +++ b/kshutdown/systemconfig.cpp @@ -22,8 +22,8 @@ #include "miscutils.h" #include "systemconfig.h" -#include -#include +#include +#include #include #include @@ -187,3 +187,4 @@ void SystemConfig::slotExecuted(TQListViewItem *item) return; } } +#include "systemconfig.moc" diff --git a/kshutdownlockout/CMakeLists.txt b/kshutdownlockout/CMakeLists.txt new file mode 100644 index 0000000..a98caee --- /dev/null +++ b/kshutdownlockout/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kshutdownlockout_panelapplet (kpart) + +tde_add_kpart( kshutdownlockout_panelapplet AUTOMOC + + SOURCES + lockout.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kshutdownlockout.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets +) diff --git a/kshutdownlockout/lockout.cpp b/kshutdownlockout/lockout.cpp index d1cd5d2..419a1ad 100644 --- a/kshutdownlockout/lockout.cpp +++ b/kshutdownlockout/lockout.cpp @@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "lockout.h" -#include -#include -#include +#include +#include +#include #include #include @@ -234,3 +234,4 @@ void Lockout::slotShowKShutDown() { void Lockout::slotShutDown() { runCommand("kshutdown --init --confirm --shutdown"); } +#include "lockout.moc" diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt new file mode 100644 index 0000000..2713a3e --- /dev/null +++ b/pics/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons() diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..597c341 --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1,5 @@ +file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) + +if( _srcs ) + tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) +endif( ) diff --git a/sounds/CMakeLists.txt b/sounds/CMakeLists.txt new file mode 100644 index 0000000..4b01e07 --- /dev/null +++ b/sounds/CMakeLists.txt @@ -0,0 +1,13 @@ +install( + FILES + COPYRIGHT + 1m.ogg + 5m.ogg + + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sounds +) + +install( + FILES eventsrc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +)