Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22: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

60
dnssd/CMakeLists.txt
View file

@ -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

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.
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.

1567
includes/CMakeLists.txt
View file

File diff suppressed because it is too large Load diff

21
interfaces/kmediaplayer/CMakeLists.txt
View file

@ -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}
)

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

@ -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}
)

11
interfaces/kregexpeditor/CMakeLists.txt
View file

@ -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}
)

21
interfaces/kspeech/CMakeLists.txt
View file

@ -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}
)

24
interfaces/ktexteditor/CMakeLists.txt
View file

@ -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}
)

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}
)