Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 10:52:53 +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 2016-04-09 17:24:49 +00:00
parent 805ec306e4
commit e9a067897a
12 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdeplasma-addons/applets/pastebin/CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(pastebin_SRCS
) )
kde4_add_plugin(plasma_applet_pastebin ${pastebin_SRCS}) kde4_add_plugin(plasma_applet_pastebin ${pastebin_SRCS})
target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS}) target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS plasma_applet_pastebin DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS plasma_applet_pastebin DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-applet-pastebin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-applet-pastebin.desktop DESTINATION ${SERVICES_INSTALL_DIR})

2
kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
View file

@ -17,7 +17,7 @@ set(plasmaweather_HEADERS
add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS}) add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS})
target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${KDE4WORKSPACE_WEATHERION_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS}) target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${KDE4WORKSPACE_WEATHERION_LIBRARY})
set_target_properties(plasmaweather PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) set_target_properties(plasmaweather PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS plasmaweather ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS plasmaweather ${INSTALL_TARGETS_DEFAULT_ARGS})
# nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers! # nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers!

3
kdeplasma-addons/wallpapers/virus/CMakeLists.txt
View file

@ -7,14 +7,13 @@ set(virus_SRCS
backgroundlistmodel.cpp backgroundlistmodel.cpp
alife.cpp alife.cpp
itemsview.cpp itemsview.cpp
virusconfig.ui
) )
set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface) qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface)
kde4_add_plugin(plasma_wallpaper_virus ${virus_SRCS}) kde4_add_plugin(plasma_wallpaper_virus ${virus_SRCS})
target_link_libraries(plasma_wallpaper_virus ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_THREADWEAVER_LIBRARY}) target_link_libraries(plasma_wallpaper_virus ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_THREADWEAVER_LIBRARY})
install(TARGETS plasma_wallpaper_virus DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS plasma_wallpaper_virus DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-wallpaper-virus.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-wallpaper-virus.desktop DESTINATION ${SERVICES_INSTALL_DIR})

3
kdeplasma-addons/wallpapers/weather/CMakeLists.txt
View file

@ -4,11 +4,10 @@ set(weather_SRCS
weatherwallpaper.cpp weatherwallpaper.cpp
backgrounddelegate.cpp backgrounddelegate.cpp
backgroundlistmodel.cpp backgroundlistmodel.cpp
weatherAdvanced.ui
) )
kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS}) kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS})
target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_THREADWEAVER_LIBRARY} plasmaweather) target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} plasmaweather)
install(TARGETS plasma_wallpaper_weather DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS plasma_wallpaper_weather DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-wallpaper-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-wallpaper-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR})

1
kdevplatform/language/CMakeLists.txt
View file

@ -162,7 +162,6 @@ target_link_libraries(kdevplatformlanguage LINK_PRIVATE
${KDE4_KPARTS_LIBS} ${KDE4_KPARTS_LIBS}
${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KTEXTEDITOR_LIBS}
${KDE4_THREADWEAVER_LIBS} ${KDE4_THREADWEAVER_LIBS}
${KDE4_KNEWSTUFF3_LIBS}
kdevplatformutil kdevplatformutil
${Grantlee_CORE_LIBRARIES} ${Grantlee_CORE_LIBRARIES}
) )

7
kdevplatform/plugins/appwizard/CMakeLists.txt
View file

@ -19,8 +19,11 @@ target_link_libraries(kdevappwizard
${KDE4_KDECORE_LIBS} ${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS} ${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS} ${KDE4_KDEUI_LIBS}
${KDE4_KNEWSTUFF3_LIBS} kdevplatforminterfaces
kdevplatforminterfaces kdevplatformvcs kdevplatformlanguage kdevplatformutil) kdevplatformvcs
kdevplatformlanguage
kdevplatformutil
)
install(TARGETS kdevappwizard DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdevappwizard DESTINATION ${PLUGIN_INSTALL_DIR} )

2
kdevplatform/plugins/externalscript/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(kdevexternalscript_PART_SRCS
kde4_add_plugin(kdevexternalscript ${kdevexternalscript_PART_SRCS}) kde4_add_plugin(kdevexternalscript ${kdevexternalscript_PART_SRCS})
target_link_libraries(kdevexternalscript target_link_libraries(kdevexternalscript
${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS}
kdevplatformlanguage kdevplatforminterfaces kdevplatformproject kdevplatformlanguage kdevplatforminterfaces kdevplatformproject
kdevplatformutil kdevplatformoutputview kdevplatformutil kdevplatformoutputview
) )

2
kdevplatform/plugins/filetemplates/CMakeLists.txt
View file

@ -23,7 +23,6 @@ target_link_libraries(kdevfiletemplates
${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES}
${KDEVPLATFORM_UTIL_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
${KDE4_KNEWSTUFF3_LIBS}
) )
install(TARGETS kdevfiletemplates DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdevfiletemplates DESTINATION ${PLUGIN_INSTALL_DIR} )
@ -79,5 +78,4 @@ target_link_libraries(testfiletemplates
${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES}
${KDEVPLATFORM_UTIL_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES}
${KDE4_KNEWSTUFF3_LIBS}
) )

5
kdevplatform/plugins/snippet/CMakeLists.txt
View file

@ -15,13 +15,10 @@ set(kdevsnippet_PART_SRCS
legacy/snippet.cpp legacy/snippet.cpp
legacy/editrepository.cpp legacy/editrepository.cpp
legacy/editsnippet.cpp legacy/editsnippet.cpp
legacy/snippetview.ui
legacy/editrepository.ui
legacy/editsnippet.ui
) )
kde4_add_plugin(kdevsnippet ${kdevsnippet_PART_SRCS}) kde4_add_plugin(kdevsnippet ${kdevsnippet_PART_SRCS})
target_link_libraries(kdevsnippet ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS} target_link_libraries(kdevsnippet ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS}
kdevplatformlanguage kdevplatforminterfaces) kdevplatformlanguage kdevplatforminterfaces)
install( TARGETS kdevsnippet DESTINATION ${PLUGIN_INSTALL_DIR} ) install( TARGETS kdevsnippet DESTINATION ${PLUGIN_INSTALL_DIR} )

4
kdevplatform/plugins/templatemanager/CMakeLists.txt
View file

@ -2,13 +2,11 @@
set(kdevtemplatemanager_config_SRCS set(kdevtemplatemanager_config_SRCS
templateconfig.cpp templateconfig.cpp
templatepage.cpp templatepage.cpp
templateconfig.ui
templatepage.ui
) )
kde4_add_plugin( kdevtemplatemanager_config ${kdevtemplatemanager_config_SRCS} ) kde4_add_plugin( kdevtemplatemanager_config ${kdevtemplatemanager_config_SRCS} )
target_link_libraries( kdevtemplatemanager_config ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} kdevplatforminterfaces) target_link_libraries( kdevtemplatemanager_config ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} kdevplatforminterfaces)
install( TARGETS kdevtemplatemanager_config DESTINATION ${PLUGIN_INSTALL_DIR} ) install( TARGETS kdevtemplatemanager_config DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES kdevtemplatemanager_config.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kdevtemplatemanager_config.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

3
okular/part.cpp
View file

@ -58,9 +58,6 @@
#include <kicon.h> #include <kicon.h>
#include <kfilterdev.h> #include <kfilterdev.h>
#include <kfilterbase.h> #include <kfilterbase.h>
#if 0
#include <knewstuff2/engine.h>
#endif
#include <kdeprintdialog.h> #include <kdeprintdialog.h>
#include <kprintpreview.h> #include <kprintpreview.h>
#include <kbookmarkmenu.h> #include <kbookmarkmenu.h>

6
yakuake/app/CMakeLists.txt
View file

@ -16,10 +16,6 @@ set(yakuake_SRCS
config/windowsettings.cpp config/windowsettings.cpp
config/appearancesettings.cpp config/appearancesettings.cpp
config/skinlistdelegate.cpp config/skinlistdelegate.cpp
firstrundialog.ui
config/windowsettings.ui
behaviorsettings.ui
config/appearancesettings.ui
) )
@ -27,7 +23,7 @@ kde4_add_kcfg_files(yakuake_SRCS config/settings.kcfgc)
add_executable(yakuake ${yakuake_SRCS}) add_executable(yakuake ${yakuake_SRCS})
target_link_libraries(yakuake ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}) target_link_libraries(yakuake ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KPARTS_LIBS})
if(Q_WS_X11) if(Q_WS_X11)
target_link_libraries(yakuake ${X11_X11_LIB}) target_link_libraries(yakuake ${X11_X11_LIB})