Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: build system cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-10-31 05:10:27 +02:00
parent f16d4e7806
commit f5bf40a525
9 changed files with 917 additions and 817 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dnssd/CMakeLists.txt
View file

@ -1,7 +1,9 @@
project(dnssd) project(dnssd)
macro_optional_find_package(Avahi) macro_optional_find_package(Avahi)
macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI) macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI)
set_package_properties(Avahi PROPERTIES DESCRIPTION "Facilities for service discovery on a local network (DNSSD)" set_package_properties(Avahi PROPERTIES
DESCRIPTION "Facilities for service discovery on a local network (DNSSD)"
URL "http://avahi.org" URL "http://avahi.org"
TYPE OPTIONAL TYPE OPTIONAL
PURPOSE "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery" PURPOSE "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery"
@ -10,14 +12,18 @@ set_package_properties(Avahi PROPERTIES DESCRIPTION "Facilities for service disc
if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) if(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION)
include_directories( ${KDE4_KDECORE_INCLUDES} ) include_directories( ${KDE4_KDECORE_INCLUDES} )
set(KDNSSD_BASE_LIBS ${KDE4_KDECORE_LIBS}) set(KDNSSD_BASE_LIBS ${KDE4_KDECORE_LIBS})
else(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) else()
include_directories( ${KDE4_KDEUI_INCLUDES} ) include_directories( ${KDE4_KDEUI_INCLUDES} )
set(KDNSSD_BASE_LIBS ${KDE4_KDEUI_LIBS}) set(KDNSSD_BASE_LIBS ${KDE4_KDEUI_LIBS})
endif(KDE_PLATFORM_FEATURE_BINARY_INCOMPATIBLE_FEATURE_REDUCTION) endif()
include(CreateKcfgFiles.cmake) 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 ) kde4_add_kcfg_files(kdnssd_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/settings.kcfgc )
if(HAVE_AVAHI) if(HAVE_AVAHI)
@ -84,9 +90,16 @@ add_library(kdnssd ${LIBRARY_TYPE} ${kdnssd_LIB_SRCS})
# KDE 5: don't link against KDEUI_LIBS (when settings.kfgc is changed) # KDE 5: don't link against KDEUI_LIBS (when settings.kfgc is changed)
if(HAVE_DNSSD) if(HAVE_DNSSD)
target_link_libraries(kdnssd PRIVATE ${KDNSSD_BASE_LIBS} ${DNSSD_LIBRARIES} ${QT_QTNETWORK_LIBRARY}) target_link_libraries(kdnssd PRIVATE
${KDNSSD_BASE_LIBS}
${DNSSD_LIBRARIES}
${QT_QTNETWORK_LIBRARY}
)
else(HAVE_DNSSD) else(HAVE_DNSSD)
target_link_libraries(kdnssd PRIVATE ${KDNSSD_BASE_LIBS} ${QT_QTNETWORK_LIBRARY}) target_link_libraries(kdnssd PRIVATE
${KDNSSD_BASE_LIBS}
${QT_QTNETWORK_LIBRARY}
)
endif(HAVE_DNSSD) endif(HAVE_DNSSD)
target_link_libraries(kdnssd PUBLIC kdecore ${QT_QTCORE_LIBRARY} ) target_link_libraries(kdnssd PUBLIC kdecore ${QT_QTCORE_LIBRARY} )
@ -96,10 +109,15 @@ set_target_properties(kdnssd PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION} 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 install(
FILES
dnssd_export.h dnssd_export.h
domainbrowser.h domainbrowser.h
remoteservice.h remoteservice.h

5
dnssd/PACKAGERS
View file

@ -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. If you package kdnssd with Avahi support (default on Linux) make sure that NSS
Without nss-mdns working, users will be able to see remote services but trying to access them will fail. 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.

135
includes/CMakeLists.txt
View file

@ -1,4 +1,5 @@
install( FILES install(
FILES
KACL KACL
KAboutApplicationDialog KAboutApplicationDialog
KAboutData KAboutData
@ -431,10 +432,6 @@ install( FILES
KWebView KWebView
KWebPluginFactory KWebPluginFactory
KWebWallet KWebWallet
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
if (UNIX)
install( FILES
KDEsuClient KDEsuClient
KPty KPty
KPtyDevice KPtyDevice
@ -443,17 +440,22 @@ if (UNIX)
SshProcess SshProcess
StubProcess StubProcess
SuProcess SuProcess
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE
endif (UNIX) COMPONENT Devel
)
install( FILES install(
FILES
ConversionCheck/QVconvertible ConversionCheck/QVconvertible
ConversionCheck/type_toQString ConversionCheck/type_toQString
ConversionCheck/type_toQVariant ConversionCheck/type_toQVariant
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ConversionCheck COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ConversionCheck
COMPONENT Devel
)
install( FILES install(
FILES
DNSSD/Configuration DNSSD/Configuration
DNSSD/DomainBrowser DNSSD/DomainBrowser
DNSSD/DomainModel DNSSD/DomainModel
@ -463,12 +465,17 @@ install( FILES
DNSSD/ServiceBrowser DNSSD/ServiceBrowser
DNSSD/ServiceModel DNSSD/ServiceModel
DNSSD/ServiceTypeBrowser DNSSD/ServiceTypeBrowser
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/DNSSD COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/DNSSD
COMPONENT Devel
)
install( FILES install(
FILES
KAccelGen/Deref KAccelGen/Deref
KAccelGen/Deref_Key KAccelGen/Deref_Key
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAccelGen COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAccelGen
COMPONENT Devel
)
install( FILES install( FILES
@ -476,10 +483,13 @@ install( FILES
KHE/ClipboardInterface KHE/ClipboardInterface
KHE/ValueColumnInterface KHE/ValueColumnInterface
KHE/ZoomInterface KHE/ZoomInterface
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KHE COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KHE
COMPONENT Devel
)
install( FILES install(
FILES
KIO/AccessManager KIO/AccessManager
KIO/AuthInfo KIO/AuthInfo
KIO/ChmodJob KIO/ChmodJob
@ -517,14 +527,20 @@ install( FILES
KIO/TCPSlaveBase KIO/TCPSlaveBase
KIO/Task KIO/Task
KIO/TransferJob KIO/TransferJob
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KIO COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KIO
COMPONENT Devel
)
install( FILES install(
FILES
KMediaPlayer/Player KMediaPlayer/Player
KMediaPlayer/View KMediaPlayer/View
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KMediaPlayer COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KMediaPlayer
COMPONENT Devel
)
install( FILES install(
FILES
KParts/BrowserExtension KParts/BrowserExtension
KParts/BrowserHostExtension KParts/BrowserHostExtension
KParts/BrowserInterface KParts/BrowserInterface
@ -551,10 +567,13 @@ install( FILES
KParts/StatusBarExtension KParts/StatusBarExtension
KParts/TextExtension KParts/TextExtension
KParts/WindowArgs KParts/WindowArgs
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KParts COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KParts
COMPONENT Devel
)
install( FILES install(
FILES
Kross/Action Kross/Action
Kross/ActionCollection Kross/ActionCollection
Kross/ActionCollectionEditor Kross/ActionCollectionEditor
@ -576,25 +595,34 @@ install( FILES
Kross/Script Kross/Script
Kross/ScriptingPlugin Kross/ScriptingPlugin
Kross/WrapperInterface Kross/WrapperInterface
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kross COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Kross
COMPONENT Devel
)
install( FILES install(
FILES
KSettings/Dialog KSettings/Dialog
KSettings/Dispatcher KSettings/Dispatcher
KSettings/PluginPage KSettings/PluginPage
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KSettings COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KSettings
COMPONENT Devel
)
#install( FILES #install(
# FILES
# Sonnet/GuessLanguage # Sonnet/GuessLanguage
# Sonnet/UnicodeData # Sonnet/UnicodeData
# Sonnet/TextBreaks # Sonnet/TextBreaks
# Sonnet/Spell # Sonnet/Spell
#DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet ) # DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet
# COMPONENT Devel
#)
install( FILES install(
FILES
KTextEditor/Attribute KTextEditor/Attribute
KTextEditor/CodeCompletionInterface KTextEditor/CodeCompletionInterface
KTextEditor/CodeCompletionModel KTextEditor/CodeCompletionModel
@ -633,15 +661,21 @@ install( FILES
KTextEditor/TextHintInterface KTextEditor/TextHintInterface
KTextEditor/VariableInterface KTextEditor/VariableInterface
KTextEditor/View KTextEditor/View
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KTextEditor COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KTextEditor
COMPONENT Devel
)
install( FILES install(
FILES
KWallet/Wallet KWallet/Wallet
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KWallet COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KWallet
COMPONENT Devel
)
install( FILES install(
FILES
Solid/AcAdapter Solid/AcAdapter
Solid/AudioInterface Solid/AudioInterface
Solid/Battery Solid/Battery
@ -665,25 +699,34 @@ install( FILES
Solid/StorageAccess Solid/StorageAccess
Solid/StorageDrive Solid/StorageDrive
Solid/StorageVolume Solid/StorageVolume
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Solid COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Solid
COMPONENT Devel
)
install( FILES install(
FILES
Sonnet/ConfigDialog Sonnet/ConfigDialog
Sonnet/ConfigWidget Sonnet/ConfigWidget
Sonnet/Dialog Sonnet/Dialog
Sonnet/DictionaryComboBox Sonnet/DictionaryComboBox
Sonnet/Highlighter Sonnet/Highlighter
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Sonnet
COMPONENT Devel
)
install( FILES install(
FILES
KAuth/Action KAuth/Action
KAuth/ActionReply KAuth/ActionReply
KAuth/ActionWatcher KAuth/ActionWatcher
KAuth/HelperSupport KAuth/HelperSupport
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAuth COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KAuth
COMPONENT Devel
)
install( FILES install(
FILES
ThreadWeaver/DependencyPolicy ThreadWeaver/DependencyPolicy
ThreadWeaver/Job ThreadWeaver/Job
ThreadWeaver/JobCollection ThreadWeaver/JobCollection
@ -695,9 +738,12 @@ install( FILES
ThreadWeaver/Weaver ThreadWeaver/Weaver
ThreadWeaver/WeaverInterface ThreadWeaver/WeaverInterface
ThreadWeaver/WeaverObserver ThreadWeaver/WeaverObserver
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ThreadWeaver
COMPONENT Devel
)
install(FILES install(
FILES
Plasma/AbstractDialogManager Plasma/AbstractDialogManager
Plasma/AbstractRunner Plasma/AbstractRunner
Plasma/AbstractToolBox Plasma/AbstractToolBox
@ -770,12 +816,17 @@ install(FILES
Plasma/WallpaperScript Plasma/WallpaperScript
Plasma/WebView Plasma/WebView
Plasma/WindowEffects Plasma/WindowEffects
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma
COMPONENT Devel
)
install(FILES install(
FILES
KUnitConversion/Converter KUnitConversion/Converter
KUnitConversion/Unit KUnitConversion/Unit
KUnitConversion/UnitCategory KUnitConversion/UnitCategory
KUnitConversion/Value KUnitConversion/Value
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KUnitConversion COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/KUnitConversion
COMPONENT Devel
)

21
interfaces/kmediaplayer/CMakeLists.txt
View file

@ -12,19 +12,26 @@ set(kmediaplayer_LIB_SRCS
add_library(kmediaplayer ${LIBRARY_TYPE} ${kmediaplayer_LIB_SRCS}) add_library(kmediaplayer ${LIBRARY_TYPE} ${kmediaplayer_LIB_SRCS})
target_link_libraries(kmediaplayer PRIVATE ${KDE4_KPARTS_LIBS} ) target_link_libraries(kmediaplayer PUBLIC
target_link_libraries(kmediaplayer PUBLIC ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ) ${KDE4_KPARTS_LIBS}
${QT_QTGUI_LIBRARY}
)
set_target_properties(kmediaplayer PROPERTIES set_target_properties(kmediaplayer PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} 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 install(
FILES
kmediaplayer_export.h kmediaplayer_export.h
player.h player.h
view.h view.h
@ -32,14 +39,16 @@ install(FILES
COMPONENT Devel COMPONENT Devel
) )
install(FILES install(
FILES
kmediaplayerengine.desktop kmediaplayerengine.desktop
kmediaplayer.desktop kmediaplayer.desktop
DESTINATION DESTINATION
${SERVICETYPES_INSTALL_DIR} ${SERVICETYPES_INSTALL_DIR}
) )
install(FILES install(
FILES
org.kde.KMediaPlayer.xml org.kde.KMediaPlayer.xml
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
) )

15
interfaces/kmediaplayer/kfileaudiopreview/CMakeLists.txt
View file

@ -1,22 +1,15 @@
include_directories(${KDE4_PHONON_INCLUDES} ${KDE4_KIO_INCLUDES}) include_directories(${KDE4_PHONON_INCLUDES} ${KDE4_KIO_INCLUDES})
########### next target ###############
set(kfileaudiopreview_PART_SRCS set(kfileaudiopreview_PART_SRCS
kfileaudiopreview.cpp kfileaudiopreview.cpp
mediacontrols.cpp mediacontrols.cpp
) )
kde4_add_plugin(kfileaudiopreview ${kfileaudiopreview_PART_SRCS}) kde4_add_plugin(kfileaudiopreview ${kfileaudiopreview_PART_SRCS})
target_link_libraries(kfileaudiopreview ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS}) target_link_libraries(kfileaudiopreview ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS})
install(TARGETS kfileaudiopreview DESTINATION ${PLUGIN_INSTALL_DIR} ) install(
TARGETS kfileaudiopreview
DESTINATION ${PLUGIN_INSTALL_DIR}
########### install files ############### )

11
interfaces/kregexpeditor/CMakeLists.txt
View file

@ -1,2 +1,9 @@
install( FILES kregexpeditor.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) install(
install( FILES kregexpeditorinterface.h DESTINATION ${INCLUDE_INSTALL_DIR} ) FILES kregexpeditor.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
install(
FILES kregexpeditorinterface.h
DESTINATION ${INCLUDE_INSTALL_DIR}
)

21
interfaces/kspeech/CMakeLists.txt
View file

@ -1,3 +1,18 @@
install( FILES dbustexttospeech.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) install(
install( FILES kspeech_export.h kspeech.h DESTINATION ${INCLUDE_INSTALL_DIR} ) FILES
install( FILES org.kde.KSpeech.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) 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}
)

24
interfaces/ktexteditor/CMakeLists.txt
View file

@ -34,7 +34,6 @@ add_library(ktexteditor ${LIBRARY_TYPE} ${ktexteditor_LIB_SRCS})
target_link_libraries(ktexteditor PRIVATE target_link_libraries(ktexteditor PRIVATE
${KDE4_KDECORE_LIBS} ${KDE4_KDECORE_LIBS}
${QT_QTDBUS_LIBRARY} ${QT_QTDBUS_LIBRARY}
${KDE4_KPARTS_LIBS}
) )
target_link_libraries(ktexteditor PUBLIC ${KDE4_KPARTS_LIBS}) target_link_libraries(ktexteditor PUBLIC ${KDE4_KPARTS_LIBS})
@ -42,10 +41,15 @@ set_target_properties(ktexteditor PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} 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 install(
FILES
ktexteditor_export.h ktexteditor_export.h
factory.h factory.h
editor.h editor.h
@ -94,18 +98,16 @@ install(FILES
COMPONENT Devel COMPONENT Devel
) )
install(FILES install(
ktexteditor.desktop FILES
ktexteditorplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
install(FILES
kcm_ktexteditor.desktop kcm_ktexteditor.desktop
DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser DESTINATION ${DATA_INSTALL_DIR}/kcm_componentchooser
) )
install(FILES install(
FILES
ktexteditor.desktop
ktexteditorplugin.desktop
ktexteditor_loadsavefiltercheckplugin.desktop ktexteditor_loadsavefiltercheckplugin.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR} DESTINATION ${SERVICETYPES_INSTALL_DIR}
) )

6
interfaces/terminal/CMakeLists.txt
View file

@ -1 +1,5 @@
install( FILES kde_terminal_interface.h DESTINATION ${INCLUDE_INSTALL_DIR} ) install(
FILES
kde_terminal_interface.h
DESTINATION ${INCLUDE_INSTALL_DIR}
)