From f5bf40a5252dea2084d6d1c0d3e1ce07fe900e50 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 31 Oct 2015 05:10:27 +0200 Subject: [PATCH] generic: build system cleanups Signed-off-by: Ivailo Monev --- dnssd/CMakeLists.txt | 60 +- dnssd/PACKAGERS | 5 +- includes/CMakeLists.txt | 1567 +++++++++-------- interfaces/kmediaplayer/CMakeLists.txt | 21 +- .../kfileaudiopreview/CMakeLists.txt | 19 +- interfaces/kregexpeditor/CMakeLists.txt | 11 +- interfaces/kspeech/CMakeLists.txt | 21 +- interfaces/ktexteditor/CMakeLists.txt | 24 +- interfaces/terminal/CMakeLists.txt | 6 +- 9 files changed, 917 insertions(+), 817 deletions(-) diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index e4ed93b0..98cfe17a 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -1,23 +1,29 @@ project(dnssd) + macro_optional_find_package(Avahi) macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI) -set_package_properties(Avahi PROPERTIES DESCRIPTION "Facilities for service discovery on a local network (DNSSD)" - URL "http://avahi.org" - TYPE OPTIONAL - PURPOSE "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery" - ) +set_package_properties(Avahi PROPERTIES + DESCRIPTION "Facilities for service discovery on a local network (DNSSD)" + URL "http://avahi.org" + TYPE OPTIONAL + PURPOSE "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery" +) if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) - include_directories( ${KDE4_KDECORE_INCLUDES} ) - set(KDNSSD_BASE_LIBS ${KDE4_KDECORE_LIBS}) -else(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) - include_directories( ${KDE4_KDEUI_INCLUDES} ) - set(KDNSSD_BASE_LIBS ${KDE4_KDEUI_LIBS}) -endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) + include_directories( ${KDE4_KDECORE_INCLUDES} ) + set(KDNSSD_BASE_LIBS ${KDE4_KDECORE_LIBS}) +else() + include_directories( ${KDE4_KDEUI_INCLUDES} ) + set(KDNSSD_BASE_LIBS ${KDE4_KDEUI_LIBS}) +endif() include(CreateKcfgFiles.cmake) -set(kdnssd_LIB_SRCS servicebase.cpp servicemodel.cpp domainmodel.cpp) +set(kdnssd_LIB_SRCS + servicebase.cpp + servicemodel.cpp + domainmodel.cpp +) kde4_add_kcfg_files(kdnssd_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/settings.kcfgc ) if(HAVE_AVAHI) @@ -67,7 +73,7 @@ else(HAVE_AVAHI) mdnsd-servicebrowser.cpp mdnsd-servicetypebrowser.cpp ) - else(HAVE_DNSSD) + else(HAVE_DNSSD) set(kdnssd_LIB_SRCS ${kdnssd_LIB_SRCS} dummy-domainbrowser.cpp dummy-remoteservice.cpp @@ -75,7 +81,7 @@ else(HAVE_AVAHI) dummy-servicebrowser.cpp dummy-servicetypebrowser.cpp ) - endif(HAVE_DNSSD) + endif(HAVE_DNSSD) endif(HAVE_AVAHI) ########### next target ############### @@ -83,11 +89,18 @@ endif(HAVE_AVAHI) add_library(kdnssd ${LIBRARY_TYPE} ${kdnssd_LIB_SRCS}) # KDE 5: don't link against KDEUI_LIBS (when settings.kfgc is changed) -if (HAVE_DNSSD) - target_link_libraries(kdnssd PRIVATE ${KDNSSD_BASE_LIBS} ${DNSSD_LIBRARIES} ${QT_QTNETWORK_LIBRARY}) -else (HAVE_DNSSD) - target_link_libraries(kdnssd PRIVATE ${KDNSSD_BASE_LIBS} ${QT_QTNETWORK_LIBRARY}) -endif (HAVE_DNSSD) +if(HAVE_DNSSD) + target_link_libraries(kdnssd PRIVATE + ${KDNSSD_BASE_LIBS} + ${DNSSD_LIBRARIES} + ${QT_QTNETWORK_LIBRARY} + ) +else(HAVE_DNSSD) + target_link_libraries(kdnssd PRIVATE + ${KDNSSD_BASE_LIBS} + ${QT_QTNETWORK_LIBRARY} + ) +endif(HAVE_DNSSD) target_link_libraries(kdnssd PUBLIC kdecore ${QT_QTCORE_LIBRARY} ) @@ -96,10 +109,15 @@ set_target_properties(kdnssd PROPERTIES SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS kdnssd EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kdnssd + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### -install(FILES +install( + FILES dnssd_export.h domainbrowser.h remoteservice.h diff --git a/dnssd/PACKAGERS b/dnssd/PACKAGERS index 867f0134..fca728dd 100644 --- a/dnssd/PACKAGERS +++ b/dnssd/PACKAGERS @@ -1,2 +1,3 @@ -If you package kdnssd with Avahi support (default on Linux) make sure that NSS module for mdns is also a dependency. -Without nss-mdns working, users will be able to see remote services but trying to access them will fail. +If you package kdnssd with Avahi support (default on Linux) make sure that NSS +module for mdns is also a dependency. Without nss-mdns working, users will be +able to see remote services but trying to access them will fail. diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt index ba434a4d..6bde2746 100644 --- a/includes/CMakeLists.txt +++ b/includes/CMakeLists.txt @@ -1,781 +1,832 @@ -install( FILES - KACL - KAboutApplicationDialog - KAboutData - KAboutPerson - KAcceleratorManager - KAction - KActionCategory - KActionCollection - KActionMenu - KActionSelector - KAnimatedButton - KApplication - KAr - KArchive - KArchiveDirectory - KArchiveEntry - KArchiveFile - KAscii - KAssistantDialog - KAuthorized - KAutoMount - KAutoUnmount - KAutoSaveFile - KAutostart - KBookmark - KBookmarkAction - KBookmarkActionInterface - KBookmarkActionMenu - KBookmarkDialog - KBookmarkDomBuilder - KBookmarkExporterBase - KBookmarkGroup - KBookmarkGroupTraverser - KBookmarkImporterBase - KBookmarkManager - KBookmarkMenu - KBookmarkOwner - KBreadcrumbSelectionModel - KBugReport - KBuildSycocaProgressDialog - KButtonGroup - KCapacityBar - KCModule - KCModuleContainer - KCModuleInfo - KCModuleLoader - KCModuleProxy - KCMultiDialog - KIdleTime - KCalendarSystem - KCharMacroExpander - KCharSelect - KCharsets - KCheckableProxyModel - KCmdLineArgs - KCmdLineOptions - KCodecAction - KCodecs - KColor - KColorButton - KColorCells - KColorCollection - KColorCombo - KColorDialog - KColorMimeData - KColorPatch - KColorScheme - KColorTable - KColorUtils - KColorValueSelector - KComboBox - KCompletion - KCompletionBase - KCompletionBox - KCompletionMatches - KCompositeJob - KConfig - KConfigBase - KConfigDialog - KConfigDialogManager - KConfigGroup - KConfigSkeleton - KConfigSkeletonGenericItem - KConfigSkeletonItem - KSharedConfigPtr - KCrash - KCurrencyCode - KCursor - KDBusServiceStarter - KDebug - KDeviceListModel - KDEDModule - KDEPrintDialog - KDataTool - KDataToolAction - KDataToolInfo - KDateComboBox - KDatePicker - KDateTable - KDateTime - KDateTimeEdit - KDateTimeWidget - KDateValidator - KDateWidget - KDescendantsProxyModel - KDesktopFile - KDialog - KDialogButtonBox - KDialogJobUiDelegate - KDirLister - KDirModel - KDirNotify - KDirOperator - KDirSortFilterProxyModel - KDirSelectDialog - KDirWatch - KDualAction - KFilePreviewGenerator - KFilePlacesView - KFileWidget - KFileWritePlugin - KDiskFreeSpaceInfo - KDoubleNumInput - KDoubleValidator - KEMailSettings - KEditListWidget - KEditToolBar - KEncodingFileDialog - KExtendableItemDelegate - KFadeWidgetEffect - KFile - KFileDialog - KFileFilterCombo - KFileItem - KFileItemActions - KFileItemList - KFileItemListProperties - KFileItemDelegate - KFileMetaDataWidget - KFileMetaInfo - KFileMetaInfoGroup - KFileMetaInfoItem - KFilePlacesModel - KFileShare - KFileSharePropsPlugin - KFileTreeView - KFilterBase - KFilterDev - KFind - KFindDialog - KFloatValidator - KFontAction - KFontChooser - KFontComboBox - KFontDialog - KFontRequester - KFontSizeAction - KFontUtils - KGlobal - KGlobalAccel - KGlobalSettings - KGlobalShortcutInfo - KGradientSelector - KGuiItem - KHBox - KHelpMenu - KHistoryComboBox - KHueSaturationSelector - KIEBookmarkExporterImpl - KIEBookmarkImporter - KIEBookmarkImporterImpl - KIMProxy - KIcon - KIconButton - KIconCanvas - KIconDialog - KIconEffect - KIconLoader - KIconTheme - KIdentityProxyModel - KImageCache - KImageFilePreview - KImageIO - KInputDialog - KComponentData - KIntNumInput - KIntSpinBox - KIntValidator - KJob - KJobTrackerInterface - KJobUiDelegate - KKeySequenceWidget - KLanguageButton - KLed - KLibrary - KLineEdit - KLinkItemSelectionModel - KListWidget - KListWidgetSearchLine - KLocale - KLocalizedDate - KLocalizedString - KLockFile - KMD5 - KMacroExpanderBase - KMainWindow - KMenu - KMenuBar - KMessage - KMessageBox - KMessageBoxMessageHandler - KMessageHandler - KMessageWidget - KMimeType - KMimeTypeChooser - KMimeTypeChooserDialog - KMimeTypeTrader - KMimeTypeValidator - KModelIndexProxyMapper - KMozillaBookmarkImporterImpl - KModifierKeyInfo - KMountPoint - KMultiTabBar - KMultiTabBarButton - KMultiTabBarTab - KNameAndUrlInputDialog - KNFSShare - KNSBookmarkExporter - KNSBookmarkExporterImpl - KNSBookmarkImporter - KNSBookmarkImporterImpl - KNTLM - KNewFileMenu - KNewPasswordDialog - KNotification - KNotificationRestrictions - KNotifyConfigWidget - KNumInput - KOCRDialog - KOpenWithDialog - KOperaBookmarkExporterImpl - KOperaBookmarkImporter - KOperaBookmarkImporterImpl - KPageDialog - KPageModel - KPageView - KPageWidget - KPageWidgetItem - KPageWidgetModel - KPassivePopup - KPassivePopupMessageHandler - KPasswordDialog - KPasteTextAction - KPixmapCache - KPixmapProvider - KPixmapRegionSelectorDialog - KPixmapRegionSelectorWidget - KPlotAxis - KPlotObject - KPlotPoint - KPlotWidget - KPluginFactory - KPluginInfo - KPluginLoader - KPluginSelector - KPopupFrame - KPreviewWidgetBase - KPrintPreview - KProcess - KProgressDialog - KPropertiesDialog - KProtocolInfo - KProtocolManager - KPushButton - KRandom - KRandomSequence - KRatingPainter - KRatingWidget - KRecentDocument - KRecentFilesAction - KRecursiveFilterProxyModel - KRegExpEditorInterface - KRemoteEncoding - KReplace - KReplaceDialog - KRestrictedLine - KRichTextEdit - KRichTextWidget - KRuler - KRun - KSambaShare - KSambaShareData - KSaveFile - KScanDialog - KSelectAction - KSelectionOwner - KSelectionProxyModel - KSelectionWatcher - KSelector - KSeparator - KService - KServiceAction - KServiceGroup - KServiceType - KServiceTypeProfile - KServiceTypeTrader - KSessionManager - KSharedConfig - KSharedDataCache - KSharedPtr - KShell - KShellCompletion - KShortcut - KShortcutsDialog - KShortcutsEditor - KShortcutWidget - KSortableItem - KSortableList - KSpeech - KSplashScreen - KSqueezedTextLabel - KStandardDirs - KStandardAction - KStandardGuiItem - KStandardShortcut - KStartupInfo - KStartupInfoData - KStartupInfoId - KStatusBar - KStatusBarJobTracker - KStatusBarOfflineIndicator - KStatusNotifierItem - KStringHandler - KStringListValidator - KStyle - KStyleFactory - KSycoca - KSycocaEntry - KSystemEventFilter - KSystemTimeZone - KSystemTimeZoneSource - KSystemTimeZones - KSystemTrayIcon - KTabBar - KTabWidget - KTar - KTempDir - KTemporaryFile - KTextBrowser - KTextEdit - KTimeComboBox - KTimeZone - KTimeZoneData - KTimeZoneSource - KTimeZoneWidget - KTimeZones - KTipDatabase - KTipDialog - KTitleWidget - KToggleAction - KToggleFullScreenAction - KToggleToolBarAction - KToolBar - KToolBarLabelAction - KToolBarPopupAction - KToolBarSpacerAction - KToolInvocation - KTreeWidgetSearchLine - KTreeWidgetSearchLineWidget - KTzfileTimeZone - KTzfileTimeZoneSource - KUndoStack - KUniqueApplication - KUriFilter - KUriFilterData - KUriFilterPlugin - KUrl - KUrlComboBox - KUrlComboRequester - KUrlCompletion - KUrlLabel - KUrlNavigator - KUrlPixmapProvider - KUrlRequester - KUrlRequesterDialog - KUser - KUserGroup - KVBox - KViewStateMaintainer - KViewStateSaver - KWindowInfo - KWindowSystem - KWordMacroExpander - KWordWrap - KXBELBookmarkImporterImpl - KXErrorHandler - KXMLGUIBuilder - KXMLGUIClient - KXMLGUIFactory - KXmlGuiWindow - KXMessages - KXYSelector - KZip - KZipFileEntry - KZoneAllocator - KonqBookmarkMenu - KonqBookmarkOwner - NET - NETRootInfo - NETWinInfo - OrgKdeKDirNotifyInterface - OrgKdeKLauncherInterface - ThumbCreator - kdbgstream - kndbgstream - KCategorizedView - KCategoryDrawer - KCategorizedSortFilterProxyModel - KEmoticons - KEmoticonsProvider - KEmoticonsTheme - KFilterProxySearchLine - KWidgetItemDelegate - KWidgetJobTracker - KPixmapSequence - KPixmapSequenceWidget - KPixmapSequenceOverlayPainter - KGraphicsWebView - KWebPage - KWebView - KWebPluginFactory - KWebWallet -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) +install( + FILES + KACL + KAboutApplicationDialog + KAboutData + KAboutPerson + KAcceleratorManager + KAction + KActionCategory + KActionCollection + KActionMenu + KActionSelector + KAnimatedButton + KApplication + KAr + KArchive + KArchiveDirectory + KArchiveEntry + KArchiveFile + KAscii + KAssistantDialog + KAuthorized + KAutoMount + KAutoUnmount + KAutoSaveFile + KAutostart + KBookmark + KBookmarkAction + KBookmarkActionInterface + KBookmarkActionMenu + KBookmarkDialog + KBookmarkDomBuilder + KBookmarkExporterBase + KBookmarkGroup + KBookmarkGroupTraverser + KBookmarkImporterBase + KBookmarkManager + KBookmarkMenu + KBookmarkOwner + KBreadcrumbSelectionModel + KBugReport + KBuildSycocaProgressDialog + KButtonGroup + KCapacityBar + KCModule + KCModuleContainer + KCModuleInfo + KCModuleLoader + KCModuleProxy + KCMultiDialog + KIdleTime + KCalendarSystem + KCharMacroExpander + KCharSelect + KCharsets + KCheckableProxyModel + KCmdLineArgs + KCmdLineOptions + KCodecAction + KCodecs + KColor + KColorButton + KColorCells + KColorCollection + KColorCombo + KColorDialog + KColorMimeData + KColorPatch + KColorScheme + KColorTable + KColorUtils + KColorValueSelector + KComboBox + KCompletion + KCompletionBase + KCompletionBox + KCompletionMatches + KCompositeJob + KConfig + KConfigBase + KConfigDialog + KConfigDialogManager + KConfigGroup + KConfigSkeleton + KConfigSkeletonGenericItem + KConfigSkeletonItem + KSharedConfigPtr + KCrash + KCurrencyCode + KCursor + KDBusServiceStarter + KDebug + KDeviceListModel + KDEDModule + KDEPrintDialog + KDataTool + KDataToolAction + KDataToolInfo + KDateComboBox + KDatePicker + KDateTable + KDateTime + KDateTimeEdit + KDateTimeWidget + KDateValidator + KDateWidget + KDescendantsProxyModel + KDesktopFile + KDialog + KDialogButtonBox + KDialogJobUiDelegate + KDirLister + KDirModel + KDirNotify + KDirOperator + KDirSortFilterProxyModel + KDirSelectDialog + KDirWatch + KDualAction + KFilePreviewGenerator + KFilePlacesView + KFileWidget + KFileWritePlugin + KDiskFreeSpaceInfo + KDoubleNumInput + KDoubleValidator + KEMailSettings + KEditListWidget + KEditToolBar + KEncodingFileDialog + KExtendableItemDelegate + KFadeWidgetEffect + KFile + KFileDialog + KFileFilterCombo + KFileItem + KFileItemActions + KFileItemList + KFileItemListProperties + KFileItemDelegate + KFileMetaDataWidget + KFileMetaInfo + KFileMetaInfoGroup + KFileMetaInfoItem + KFilePlacesModel + KFileShare + KFileSharePropsPlugin + KFileTreeView + KFilterBase + KFilterDev + KFind + KFindDialog + KFloatValidator + KFontAction + KFontChooser + KFontComboBox + KFontDialog + KFontRequester + KFontSizeAction + KFontUtils + KGlobal + KGlobalAccel + KGlobalSettings + KGlobalShortcutInfo + KGradientSelector + KGuiItem + KHBox + KHelpMenu + KHistoryComboBox + KHueSaturationSelector + KIEBookmarkExporterImpl + KIEBookmarkImporter + KIEBookmarkImporterImpl + KIMProxy + KIcon + KIconButton + KIconCanvas + KIconDialog + KIconEffect + KIconLoader + KIconTheme + KIdentityProxyModel + KImageCache + KImageFilePreview + KImageIO + KInputDialog + KComponentData + KIntNumInput + KIntSpinBox + KIntValidator + KJob + KJobTrackerInterface + KJobUiDelegate + KKeySequenceWidget + KLanguageButton + KLed + KLibrary + KLineEdit + KLinkItemSelectionModel + KListWidget + KListWidgetSearchLine + KLocale + KLocalizedDate + KLocalizedString + KLockFile + KMD5 + KMacroExpanderBase + KMainWindow + KMenu + KMenuBar + KMessage + KMessageBox + KMessageBoxMessageHandler + KMessageHandler + KMessageWidget + KMimeType + KMimeTypeChooser + KMimeTypeChooserDialog + KMimeTypeTrader + KMimeTypeValidator + KModelIndexProxyMapper + KMozillaBookmarkImporterImpl + KModifierKeyInfo + KMountPoint + KMultiTabBar + KMultiTabBarButton + KMultiTabBarTab + KNameAndUrlInputDialog + KNFSShare + KNSBookmarkExporter + KNSBookmarkExporterImpl + KNSBookmarkImporter + KNSBookmarkImporterImpl + KNTLM + KNewFileMenu + KNewPasswordDialog + KNotification + KNotificationRestrictions + KNotifyConfigWidget + KNumInput + KOCRDialog + KOpenWithDialog + KOperaBookmarkExporterImpl + KOperaBookmarkImporter + KOperaBookmarkImporterImpl + KPageDialog + KPageModel + KPageView + KPageWidget + KPageWidgetItem + KPageWidgetModel + KPassivePopup + KPassivePopupMessageHandler + KPasswordDialog + KPasteTextAction + KPixmapCache + KPixmapProvider + KPixmapRegionSelectorDialog + KPixmapRegionSelectorWidget + KPlotAxis + KPlotObject + KPlotPoint + KPlotWidget + KPluginFactory + KPluginInfo + KPluginLoader + KPluginSelector + KPopupFrame + KPreviewWidgetBase + KPrintPreview + KProcess + KProgressDialog + KPropertiesDialog + KProtocolInfo + KProtocolManager + KPushButton + KRandom + KRandomSequence + KRatingPainter + KRatingWidget + KRecentDocument + KRecentFilesAction + KRecursiveFilterProxyModel + KRegExpEditorInterface + KRemoteEncoding + KReplace + KReplaceDialog + KRestrictedLine + KRichTextEdit + KRichTextWidget + KRuler + KRun + KSambaShare + KSambaShareData + KSaveFile + KScanDialog + KSelectAction + KSelectionOwner + KSelectionProxyModel + KSelectionWatcher + KSelector + KSeparator + KService + KServiceAction + KServiceGroup + KServiceType + KServiceTypeProfile + KServiceTypeTrader + KSessionManager + KSharedConfig + KSharedDataCache + KSharedPtr + KShell + KShellCompletion + KShortcut + KShortcutsDialog + KShortcutsEditor + KShortcutWidget + KSortableItem + KSortableList + KSpeech + KSplashScreen + KSqueezedTextLabel + KStandardDirs + KStandardAction + KStandardGuiItem + KStandardShortcut + KStartupInfo + KStartupInfoData + KStartupInfoId + KStatusBar + KStatusBarJobTracker + KStatusBarOfflineIndicator + KStatusNotifierItem + KStringHandler + KStringListValidator + KStyle + KStyleFactory + KSycoca + KSycocaEntry + KSystemEventFilter + KSystemTimeZone + KSystemTimeZoneSource + KSystemTimeZones + KSystemTrayIcon + KTabBar + KTabWidget + KTar + KTempDir + KTemporaryFile + KTextBrowser + KTextEdit + KTimeComboBox + KTimeZone + KTimeZoneData + KTimeZoneSource + KTimeZoneWidget + KTimeZones + KTipDatabase + KTipDialog + KTitleWidget + KToggleAction + KToggleFullScreenAction + KToggleToolBarAction + KToolBar + KToolBarLabelAction + KToolBarPopupAction + KToolBarSpacerAction + KToolInvocation + KTreeWidgetSearchLine + KTreeWidgetSearchLineWidget + KTzfileTimeZone + KTzfileTimeZoneSource + KUndoStack + KUniqueApplication + KUriFilter + KUriFilterData + KUriFilterPlugin + KUrl + KUrlComboBox + KUrlComboRequester + KUrlCompletion + KUrlLabel + KUrlNavigator + KUrlPixmapProvider + KUrlRequester + KUrlRequesterDialog + KUser + KUserGroup + KVBox + KViewStateMaintainer + KViewStateSaver + KWindowInfo + KWindowSystem + KWordMacroExpander + KWordWrap + KXBELBookmarkImporterImpl + KXErrorHandler + KXMLGUIBuilder + KXMLGUIClient + KXMLGUIFactory + KXmlGuiWindow + KXMessages + KXYSelector + KZip + KZipFileEntry + KZoneAllocator + KonqBookmarkMenu + KonqBookmarkOwner + NET + NETRootInfo + NETWinInfo + OrgKdeKDirNotifyInterface + OrgKdeKLauncherInterface + ThumbCreator + kdbgstream + kndbgstream + KCategorizedView + KCategoryDrawer + KCategorizedSortFilterProxyModel + KEmoticons + KEmoticonsProvider + KEmoticonsTheme + KFilterProxySearchLine + KWidgetItemDelegate + KWidgetJobTracker + KPixmapSequence + KPixmapSequenceWidget + KPixmapSequenceOverlayPainter + KGraphicsWebView + KWebPage + KWebView + KWebPluginFactory + KWebWallet + KDEsuClient + KPty + KPtyDevice + KPtyProcess + PtyProcess + SshProcess + StubProcess + SuProcess + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE + COMPONENT Devel +) -if (UNIX) - install( FILES - KDEsuClient - KPty - KPtyDevice - KPtyProcess - PtyProcess - SshProcess - StubProcess - SuProcess - DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) -endif (UNIX) +install( + FILES + ConversionCheck/QVconvertible + ConversionCheck/type_toQString + ConversionCheck/type_toQVariant + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ConversionCheck + COMPONENT Devel +) -install( FILES - ConversionCheck/QVconvertible - ConversionCheck/type_toQString - ConversionCheck/type_toQVariant -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ConversionCheck COMPONENT Devel) + +install( + FILES + DNSSD/Configuration + DNSSD/DomainBrowser + DNSSD/DomainModel + DNSSD/PublicService + DNSSD/RemoteService + DNSSD/ServiceBase + DNSSD/ServiceBrowser + DNSSD/ServiceModel + DNSSD/ServiceTypeBrowser + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/DNSSD + COMPONENT Devel +) + +install( + FILES + KAccelGen/Deref + KAccelGen/Deref_Key + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAccelGen + COMPONENT Devel +) install( FILES - DNSSD/Configuration - DNSSD/DomainBrowser - DNSSD/DomainModel - DNSSD/PublicService - DNSSD/RemoteService - DNSSD/ServiceBase - DNSSD/ServiceBrowser - DNSSD/ServiceModel - DNSSD/ServiceTypeBrowser -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/DNSSD COMPONENT Devel) - -install( FILES - KAccelGen/Deref - KAccelGen/Deref_Key -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAccelGen COMPONENT Devel) + KHE/CharColumnInterface + KHE/ClipboardInterface + KHE/ValueColumnInterface + KHE/ZoomInterface + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KHE + COMPONENT Devel +) -install( FILES - KHE/CharColumnInterface - KHE/ClipboardInterface - KHE/ValueColumnInterface - KHE/ZoomInterface -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KHE COMPONENT Devel) +install( + FILES + KIO/AccessManager + KIO/AuthInfo + KIO/ChmodJob + KIO/Connection + KIO/CopyInfo + KIO/CopyJob + KIO/DavJob + KIO/DeleteJob + KIO/FileCopyJob + KIO/FileJob + KIO/ForwardingSlaveBase + KIO/Job + KIO/JobClasses + KIO/JobUiDelegate + KIO/ListJob + KIO/MetaData + KIO/MetaInfoJob + KIO/MimetypeJob + KIO/MultiGetJob + KIO/NetAccess + KIO/NetRC + KIO/PreviewJob + KIO/RenameDialog + KIO/RenameDialogPlugin + KIO/Scheduler + KIO/SessionData + KIO/SimpleJob + KIO/SkipDialog + KIO/Slave + KIO/SlaveBase + KIO/SlaveConfig + KIO/SlaveInterface + KIO/StatJob + KIO/StoredTransferJob + KIO/TCPSlaveBase + KIO/Task + KIO/TransferJob + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KIO + COMPONENT Devel +) + +install( + FILES + KMediaPlayer/Player + KMediaPlayer/View + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KMediaPlayer + COMPONENT Devel +) + +install( + FILES + KParts/BrowserExtension + KParts/BrowserHostExtension + KParts/BrowserInterface + KParts/BrowserRun + KParts/ComponentFactory + KParts/Event + KParts/Factory + KParts/FileInfoExtension + KParts/GUIActivateEvent + KParts/HistoryProvider + KParts/HtmlExtension + KParts/LiveConnectExtension + KParts/ListingExtension + KParts/MainWindow + KParts/OpenUrlEvent + KParts/Part + KParts/PartActivateEvent + KParts/PartBase + KParts/PartManager + KParts/PartSelectEvent + KParts/Plugin + KParts/ReadOnlyPart + KParts/ReadWritePart + KParts/StatusBarExtension + KParts/TextExtension + KParts/WindowArgs + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KParts + COMPONENT Devel +) -install( FILES - KIO/AccessManager - KIO/AuthInfo - KIO/ChmodJob - KIO/Connection - KIO/CopyInfo - KIO/CopyJob - KIO/DavJob - KIO/DeleteJob - KIO/FileCopyJob - KIO/FileJob - KIO/ForwardingSlaveBase - KIO/Job - KIO/JobClasses - KIO/JobUiDelegate - KIO/ListJob - KIO/MetaData - KIO/MetaInfoJob - KIO/MimetypeJob - KIO/MultiGetJob - KIO/NetAccess - KIO/NetRC - KIO/PreviewJob - KIO/RenameDialog - KIO/RenameDialogPlugin - KIO/Scheduler - KIO/SessionData - KIO/SimpleJob - KIO/SkipDialog - KIO/Slave - KIO/SlaveBase - KIO/SlaveConfig - KIO/SlaveInterface - KIO/StatJob - KIO/StoredTransferJob - KIO/TCPSlaveBase - KIO/Task - KIO/TransferJob -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KIO COMPONENT Devel) - -install( FILES - KMediaPlayer/Player - KMediaPlayer/View -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KMediaPlayer COMPONENT Devel) - -install( FILES - KParts/BrowserExtension - KParts/BrowserHostExtension - KParts/BrowserInterface - KParts/BrowserRun - KParts/ComponentFactory - KParts/Event - KParts/Factory - KParts/FileInfoExtension - KParts/GUIActivateEvent - KParts/HistoryProvider - KParts/HtmlExtension - KParts/LiveConnectExtension - KParts/ListingExtension - KParts/MainWindow - KParts/OpenUrlEvent - KParts/Part - KParts/PartActivateEvent - KParts/PartBase - KParts/PartManager - KParts/PartSelectEvent - KParts/Plugin - KParts/ReadOnlyPart - KParts/ReadWritePart - KParts/StatusBarExtension - KParts/TextExtension - KParts/WindowArgs -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KParts COMPONENT Devel) +install( + FILES + Kross/Action + Kross/ActionCollection + Kross/ActionCollectionEditor + Kross/ActionCollectionModel + Kross/ActionCollectionProxyModel + Kross/ActionCollectionView + Kross/ChildrenInterface + Kross/ErrorInterface + Kross/Interpreter + Kross/InterpreterInfo + Kross/Manager + Kross/MetaFunction + Kross/MetaType + Kross/MetaTypeHandler + Kross/MetaTypeImpl + Kross/MetaTypeVariant + Kross/MetaTypeVoidStar + Kross/Object + Kross/Script + Kross/ScriptingPlugin + Kross/WrapperInterface + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kross + COMPONENT Devel +) -install( FILES - Kross/Action - Kross/ActionCollection - Kross/ActionCollectionEditor - Kross/ActionCollectionModel - Kross/ActionCollectionProxyModel - Kross/ActionCollectionView - Kross/ChildrenInterface - Kross/ErrorInterface - Kross/Interpreter - Kross/InterpreterInfo - Kross/Manager - Kross/MetaFunction - Kross/MetaType - Kross/MetaTypeHandler - Kross/MetaTypeImpl - Kross/MetaTypeVariant - Kross/MetaTypeVoidStar - Kross/Object - Kross/Script - Kross/ScriptingPlugin - Kross/WrapperInterface -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kross COMPONENT Devel) +install( + FILES + KSettings/Dialog + KSettings/Dispatcher + KSettings/PluginPage + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KSettings + COMPONENT Devel +) -install( FILES - KSettings/Dialog - KSettings/Dispatcher - KSettings/PluginPage -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KSettings COMPONENT Devel) +#install( +# FILES +# Sonnet/GuessLanguage +# Sonnet/UnicodeData +# Sonnet/TextBreaks +# Sonnet/Spell +# DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet +# COMPONENT Devel +#) -#install( FILES -# Sonnet/GuessLanguage -# Sonnet/UnicodeData -# Sonnet/TextBreaks -# Sonnet/Spell -#DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet ) +install( + FILES + KTextEditor/Attribute + KTextEditor/CodeCompletionInterface + KTextEditor/CodeCompletionModel + KTextEditor/CodeCompletionModelControllerInterface + KTextEditor/Command + KTextEditor/CommandExtension + KTextEditor/CommandInterface + KTextEditor/ConfigInterface + KTextEditor/ConfigPage + KTextEditor/ContainerInterface + KTextEditor/Cursor + KTextEditor/Document + KTextEditor/Editor + KTextEditor/EditorChooser + KTextEditor/Factory + KTextEditor/HighlightInterface + KTextEditor/MarkInterface + KTextEditor/ModificationInterface + KTextEditor/MovingCursor + KTextEditor/MovingInterface + KTextEditor/MovingRange + KTextEditor/ParameterizedSessionConfigInterface + KTextEditor/Plugin + KTextEditor/Range + KTextEditor/SearchInterface + KTextEditor/SessionConfigInterface + KTextEditor/SmartCursor + KTextEditor/SmartCursorNotifier + KTextEditor/SmartCursorWatcher + KTextEditor/SmartInterface + KTextEditor/SmartRange + KTextEditor/SmartRangeNotifier + KTextEditor/SmartRangeWatcher + KTextEditor/TemplateInterface + KTextEditor/TemplateInterface2 + KTextEditor/TextHintInterface + KTextEditor/VariableInterface + KTextEditor/View + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KTextEditor + COMPONENT Devel +) -install( FILES - KTextEditor/Attribute - KTextEditor/CodeCompletionInterface - KTextEditor/CodeCompletionModel - KTextEditor/CodeCompletionModelControllerInterface - KTextEditor/Command - KTextEditor/CommandExtension - KTextEditor/CommandInterface - KTextEditor/ConfigInterface - KTextEditor/ConfigPage - KTextEditor/ContainerInterface - KTextEditor/Cursor - KTextEditor/Document - KTextEditor/Editor - KTextEditor/EditorChooser - KTextEditor/Factory - KTextEditor/HighlightInterface - KTextEditor/MarkInterface - KTextEditor/ModificationInterface - KTextEditor/MovingCursor - KTextEditor/MovingInterface - KTextEditor/MovingRange - KTextEditor/ParameterizedSessionConfigInterface - KTextEditor/Plugin - KTextEditor/Range - KTextEditor/SearchInterface - KTextEditor/SessionConfigInterface - KTextEditor/SmartCursor - KTextEditor/SmartCursorNotifier - KTextEditor/SmartCursorWatcher - KTextEditor/SmartInterface - KTextEditor/SmartRange - KTextEditor/SmartRangeNotifier - KTextEditor/SmartRangeWatcher - KTextEditor/TemplateInterface - KTextEditor/TemplateInterface2 - KTextEditor/TextHintInterface - KTextEditor/VariableInterface - KTextEditor/View -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KTextEditor COMPONENT Devel) +install( + FILES + KWallet/Wallet + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KWallet + COMPONENT Devel +) -install( FILES - KWallet/Wallet -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KWallet COMPONENT Devel) +install( + FILES + Solid/AcAdapter + Solid/AudioInterface + Solid/Battery + Solid/Block + Solid/Button + Solid/Camera + Solid/Device + Solid/DeviceInterface + Solid/DeviceNotifier + Solid/DvbInterface + Solid/GenericInterface + Solid/NetworkInterface + Solid/NetworkShare + Solid/Networking + Solid/OpticalDisc + Solid/OpticalDrive + Solid/PortableMediaPlayer + Solid/PowerManagement + Solid/Predicate + Solid/Processor + Solid/StorageAccess + Solid/StorageDrive + Solid/StorageVolume + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Solid + COMPONENT Devel +) -install( FILES - Solid/AcAdapter - Solid/AudioInterface - Solid/Battery - Solid/Block - Solid/Button - Solid/Camera - Solid/Device - Solid/DeviceInterface - Solid/DeviceNotifier - Solid/DvbInterface - Solid/GenericInterface - Solid/NetworkInterface - Solid/NetworkShare - Solid/Networking - Solid/OpticalDisc - Solid/OpticalDrive - Solid/PortableMediaPlayer - Solid/PowerManagement - Solid/Predicate - Solid/Processor - Solid/StorageAccess - Solid/StorageDrive - Solid/StorageVolume -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Solid COMPONENT Devel) +install( + FILES + Sonnet/ConfigDialog + Sonnet/ConfigWidget + Sonnet/Dialog + Sonnet/DictionaryComboBox + Sonnet/Highlighter + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet + COMPONENT Devel +) + +install( + FILES + KAuth/Action + KAuth/ActionReply + KAuth/ActionWatcher + KAuth/HelperSupport + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAuth + COMPONENT Devel +) + +install( + FILES + ThreadWeaver/DependencyPolicy + ThreadWeaver/Job + ThreadWeaver/JobCollection + ThreadWeaver/JobSequence + ThreadWeaver/QueuePolicy + ThreadWeaver/ResourceRestrictionPolicy + ThreadWeaver/State + ThreadWeaver/Thread + ThreadWeaver/Weaver + ThreadWeaver/WeaverInterface + ThreadWeaver/WeaverObserver + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver + COMPONENT Devel +) + +install( + FILES + Plasma/AbstractDialogManager + Plasma/AbstractRunner + Plasma/AbstractToolBox + Plasma/Animation + Plasma/Animator + Plasma/Applet + Plasma/AppletScript + Plasma/BusyWidget + Plasma/CheckBox + Plasma/ComboBox + Plasma/ConfigLoader + Plasma/Containment + Plasma/ContainmentActions + Plasma/Corona + Plasma/DataContainer + Plasma/DataEngine + Plasma/DataEngineManager + Plasma/DataEngineScript + Plasma/DeclarativeWidget + Plasma/Delegate + Plasma/Dialog + Plasma/Extender + Plasma/ExtenderGroup + Plasma/ExtenderItem + Plasma/FlashingLabel + Plasma/Frame + Plasma/FrameSvg + Plasma/GroupBox + Plasma/IconWidget + Plasma/ItemBackground + Plasma/Label + Plasma/LineEdit + Plasma/Meter + Plasma/Package + Plasma/PackageMetadata + Plasma/PackageStructure + Plasma/PaintUtils + Plasma/Plasma + Plasma/PluginLoader + Plasma/PopupApplet + Plasma/PushButton + Plasma/QueryMatch + Plasma/RadioButton + Plasma/RunnerContext + Plasma/RunnerManager + Plasma/RunnerScript + Plasma/ScriptEngine + Plasma/ScrollBar + Plasma/ScrollWidget + Plasma/Separator + Plasma/Service + Plasma/ServiceJob + Plasma/SignalPlotter + Plasma/Slider + Plasma/SpinBox + Plasma/Svg + Plasma/SvgWidget + Plasma/TabBar + Plasma/TextBrowser + Plasma/TextEdit + Plasma/Theme + Plasma/ToolButton + Plasma/ToolTipContent + Plasma/ToolTipManager + Plasma/TreeView + Plasma/Version + Plasma/VideoWidget + Plasma/View + Plasma/Wallpaper + Plasma/WallpaperScript + Plasma/WebView + Plasma/WindowEffects + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma + COMPONENT Devel +) -install( FILES - Sonnet/ConfigDialog - Sonnet/ConfigWidget - Sonnet/Dialog - Sonnet/DictionaryComboBox - Sonnet/Highlighter -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet COMPONENT Devel) - -install( FILES - KAuth/Action - KAuth/ActionReply - KAuth/ActionWatcher - KAuth/HelperSupport -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAuth COMPONENT Devel) - -install( FILES - ThreadWeaver/DependencyPolicy - ThreadWeaver/Job - ThreadWeaver/JobCollection - ThreadWeaver/JobSequence - ThreadWeaver/QueuePolicy - ThreadWeaver/ResourceRestrictionPolicy - ThreadWeaver/State - ThreadWeaver/Thread - ThreadWeaver/Weaver - ThreadWeaver/WeaverInterface - ThreadWeaver/WeaverObserver -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver COMPONENT Devel) - -install(FILES - Plasma/AbstractDialogManager - Plasma/AbstractRunner - Plasma/AbstractToolBox - Plasma/Animation - Plasma/Animator - Plasma/Applet - Plasma/AppletScript - Plasma/BusyWidget - Plasma/CheckBox - Plasma/ComboBox - Plasma/ConfigLoader - Plasma/Containment - Plasma/ContainmentActions - Plasma/Corona - Plasma/DataContainer - Plasma/DataEngine - Plasma/DataEngineManager - Plasma/DataEngineScript - Plasma/DeclarativeWidget - Plasma/Delegate - Plasma/Dialog - Plasma/Extender - Plasma/ExtenderGroup - Plasma/ExtenderItem - Plasma/FlashingLabel - Plasma/Frame - Plasma/FrameSvg - Plasma/GroupBox - Plasma/IconWidget - Plasma/ItemBackground - Plasma/Label - Plasma/LineEdit - Plasma/Meter - Plasma/Package - Plasma/PackageMetadata - Plasma/PackageStructure - Plasma/PaintUtils - Plasma/Plasma - Plasma/PluginLoader - Plasma/PopupApplet - Plasma/PushButton - Plasma/QueryMatch - Plasma/RadioButton - Plasma/RunnerContext - Plasma/RunnerManager - Plasma/RunnerScript - Plasma/ScriptEngine - Plasma/ScrollBar - Plasma/ScrollWidget - Plasma/Separator - Plasma/Service - Plasma/ServiceJob - Plasma/SignalPlotter - Plasma/Slider - Plasma/SpinBox - Plasma/Svg - Plasma/SvgWidget - Plasma/TabBar - Plasma/TextBrowser - Plasma/TextEdit - Plasma/Theme - Plasma/ToolButton - Plasma/ToolTipContent - Plasma/ToolTipManager - Plasma/TreeView - Plasma/Version - Plasma/VideoWidget - Plasma/View - Plasma/Wallpaper - Plasma/WallpaperScript - Plasma/WebView - Plasma/WindowEffects -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel) - - -install(FILES - KUnitConversion/Converter - KUnitConversion/Unit - KUnitConversion/UnitCategory - KUnitConversion/Value -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KUnitConversion COMPONENT Devel) +install( + FILES + KUnitConversion/Converter + KUnitConversion/Unit + KUnitConversion/UnitCategory + KUnitConversion/Value + DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KUnitConversion + COMPONENT Devel +) diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt index 04b90e8b..2eacee09 100644 --- a/interfaces/kmediaplayer/CMakeLists.txt +++ b/interfaces/kmediaplayer/CMakeLists.txt @@ -12,19 +12,26 @@ set(kmediaplayer_LIB_SRCS add_library(kmediaplayer ${LIBRARY_TYPE} ${kmediaplayer_LIB_SRCS}) -target_link_libraries(kmediaplayer PRIVATE ${KDE4_KPARTS_LIBS} ) -target_link_libraries(kmediaplayer PUBLIC ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ) +target_link_libraries(kmediaplayer PUBLIC + ${KDE4_KPARTS_LIBS} + ${QT_QTGUI_LIBRARY} +) set_target_properties(kmediaplayer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS kmediaplayer EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kmediaplayer + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### -install(FILES +install( + FILES kmediaplayer_export.h player.h view.h @@ -32,14 +39,16 @@ install(FILES COMPONENT Devel ) -install(FILES +install( + FILES kmediaplayerengine.desktop kmediaplayer.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install(FILES +install( + FILES org.kde.KMediaPlayer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt index db8b61b6..218e1773 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt +++ b/interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt @@ -1,22 +1,15 @@ - include_directories(${KDE4_PHONON_INCLUDES} ${KDE4_KIO_INCLUDES}) - -########### next target ############### - set(kfileaudiopreview_PART_SRCS -kfileaudiopreview.cpp -mediacontrols.cpp + kfileaudiopreview.cpp + mediacontrols.cpp ) - kde4_add_plugin(kfileaudiopreview ${kfileaudiopreview_PART_SRCS}) target_link_libraries(kfileaudiopreview ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS}) -install(TARGETS kfileaudiopreview DESTINATION ${PLUGIN_INSTALL_DIR} ) - - -########### install files ############### - - +install( + TARGETS kfileaudiopreview + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/interfaces/kregexpeditor/CMakeLists.txt b/interfaces/kregexpeditor/CMakeLists.txt index 296ab51b..6a59c833 100644 --- a/interfaces/kregexpeditor/CMakeLists.txt +++ b/interfaces/kregexpeditor/CMakeLists.txt @@ -1,2 +1,9 @@ -install( FILES kregexpeditor.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kregexpeditorinterface.h DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( + FILES kregexpeditor.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + +install( + FILES kregexpeditorinterface.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) diff --git a/interfaces/kspeech/CMakeLists.txt b/interfaces/kspeech/CMakeLists.txt index 633104f2..8502cbe6 100644 --- a/interfaces/kspeech/CMakeLists.txt +++ b/interfaces/kspeech/CMakeLists.txt @@ -1,3 +1,18 @@ -install( FILES dbustexttospeech.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kspeech_export.h kspeech.h DESTINATION ${INCLUDE_INSTALL_DIR} ) -install( FILES org.kde.KSpeech.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) +install( + FILES + dbustexttospeech.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + +install( + FILES + kspeech_export.h + kspeech.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) + +install( + FILES + org.kde.KSpeech.xml + DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} +) diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt index 82e84c04..bcbdcbce 100644 --- a/interfaces/ktexteditor/CMakeLists.txt +++ b/interfaces/ktexteditor/CMakeLists.txt @@ -34,7 +34,6 @@ add_library(ktexteditor ${LIBRARY_TYPE} ${ktexteditor_LIB_SRCS}) target_link_libraries(ktexteditor PRIVATE ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} - ${KDE4_KPARTS_LIBS} ) target_link_libraries(ktexteditor PUBLIC ${KDE4_KPARTS_LIBS}) @@ -42,10 +41,15 @@ set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS ktexteditor EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS ktexteditor + EXPORT kdelibsLibraryTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### -install(FILES +install( + FILES ktexteditor_export.h factory.h editor.h @@ -94,18 +98,16 @@ install(FILES COMPONENT Devel ) -install(FILES - ktexteditor.desktop - ktexteditorplugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} -) - -install(FILES +install( + FILES kcm_ktexteditor.desktop DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser ) -install(FILES +install( + FILES + ktexteditor.desktop + ktexteditorplugin.desktop ktexteditor_loadsavefiltercheckplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/interfaces/terminal/CMakeLists.txt b/interfaces/terminal/CMakeLists.txt index c3eeab4c..4bbc41df 100644 --- a/interfaces/terminal/CMakeLists.txt +++ b/interfaces/terminal/CMakeLists.txt @@ -1 +1,5 @@ -install( FILES kde_terminal_interface.h DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( + FILES + kde_terminal_interface.h + DESTINATION ${INCLUDE_INSTALL_DIR} +)