alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure that plasma-framework is not using anything from kdelibs4

Browse Source 
Stop finding the packages
Remove KDE4_ includes
Remove unused LIBINTL finder, provided by kdelibs
This commit is contained in:
Aleix Pol 2013-11-11 18:27:16 +01:00
parent d1171a862d
commit 1d3da96d88
4 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -53,10 +53,6 @@ find_package(KIO REQUIRED NO_MODULE)
find_package(KDE4Support REQUIRED NO_MODULE)
# Needed for some includes from KDE/ (KMimeType, etc.)
# FIXME: remove when kdeui is fully split up
find_package(KDELibs4 REQUIRED NO_MODULE)
#the shell needs kactivities
find_package(KActivities REQUIRED NO_MODULE)
@ -92,13 +88,6 @@ set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure networ
PURPOSE "KDE uses OpenSSL for the bulk of secure communications, including secure web browsing via HTTPS"
)
find_package(Libintl MODULE)
set_package_properties(Libintl PROPERTIES DESCRIPTION "Support for multiple languages"
URL "http://www.gnu.org/software/gettext"
TYPE RECOMMENDED
PURPOSE "Enables KDE to be available in many different languages"
)
#FIXME: when we have a qca for qt5, reenable
find_package(QCA2 2.0.0 MODULE)
set_package_properties(QCA2 PROPERTIES DESCRIPTION "Support for remote plasma widgets"
@ -132,16 +121,15 @@ endif()
#########################################################################
#add_definitions(${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS)
if(QCA2_FOUND)
include_directories(
${QCA2_INCLUDE_DIR}
)
# include_directories(
# ${QCA2_INCLUDE_DIR}
# )
endif()
include(PlasmaMacros.cmake)

2
examples/kpart/CMakeLists.txt
View File

@ -8,7 +8,7 @@ set(plasma_example_kpart_shell_SRCS
qt5_wrap_ui(plasma_example_kpart_shell_SRCS appletselector.ui)
add_executable(plasma-example-kpart-shell ${plasma_example_kpart_shell_SRCS})
target_link_libraries(plasma-example-kpart-shell ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} KF5::Plasma )
target_link_libraries(plasma-example-kpart-shell KF5::Plasma KF5::KParts)
########### install files ###############
install(TARGETS plasma-example-kpart-shell ${INSTALL_TARGETS_DEFAULT_ARGS} )

7
src/declarativeimports/calendar/CMakeLists.txt
View File

@ -1,5 +1,4 @@
project(calendar)
include(KDE4Defaults)
set(calendar_SRCS
calendarplugin.cpp
@ -15,9 +14,9 @@ set(calendar_SRCS
add_library(calendarplugin SHARED ${calendar_SRCS})
target_link_libraries(calendarplugin
Qt5::Core
${Qt5Quick_LIBRARIES}
${Qt5Qml_LIBRARIES}
Qt5::Core
Qt5::Quick
Qt5::Qml
Qt5::Gui
Qt5::Declarative
${KDEPIMLIBS_AKONADI_LIBS}

2
src/kpart/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(plasma_kpart_SRCS
plasma_add_plugin(plasma-kpart ${plasma_kpart_SRCS})
target_link_libraries(plasma-kpart ${QT_QTSCRIPT_LIBRARY} ${Plasma_LIBRARIES} KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} )
target_link_libraries(plasma-kpart Qt5::Script KF5::Plasma KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} KF5::KParts )
install(TARGETS plasma-kpart DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-kpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})