Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +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-09-03 00:32:29 +00:00
parent 1e26bf4a5d
commit 5625d3bd29
21 changed files with 103 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/FindPyKDE4.cmake
View file

@ -2,7 +2,6 @@
#
# Checks that Python and PyKDE4 are installed and defines a couple macros:
# * PYKDE4_INSTALL_PYTHON_FILES
# * PYKDE4_ADD_UI_FILES
# * PYKDE4_ADD_EXECUTABLE
# By Simon Edwards <simon@simonzone.com>

2
knotify/CMakeLists.txt
View file

@ -26,8 +26,8 @@ add_library(knotifyconfig ${LIBRARY_TYPE} ${knotifyconfig_LIB_SRCS})
target_link_libraries(knotifyconfig
${KDE4_KIO_LIBS}
${KDE4_KDECORE_LIBS}
${KDE4_KMEDIAPLAYER_LIBS}
${QT_QTGUI_LIBRARY}
kmediaplayer
)
set_target_properties(knotifyconfig PROPERTIES

2
kparts/CMakeLists.txt
View file

@ -34,8 +34,6 @@ target_link_libraries(kparts
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
)
set_target_properties(kparts PROPERTIES

3
kpty/CMakeLists.txt
View file

@ -42,7 +42,8 @@ install(
if(NOT HAVE_OPENPTY)
add_executable(kgrantpty kgrantpty.c)
target_link_libraries(kgrantpty kdefakes)
# it needs only some fakes but they are part of kdecore now
target_link_libraries(kgrantpty ${KDE4_KDECORE_LIBS})
install(TARGETS kgrantpty DESTINATION ${LIBEXEC_INSTALL_DIR})
endif()

4
kross/qts/CMakeLists.txt
View file

@ -12,11 +12,11 @@ include_directories(
add_library(krossqtsplugin ${LIBRARY_TYPE} plugin.cpp)
target_link_libraries(krossqtsplugin
${QT_QTUITOOLS_LIBRARY}
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
krosscore
${QT_QTSCRIPT_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
krosscore
)
set_target_properties(krossqtsplugin PROPERTIES

2
kross/ui/CMakeLists.txt
View file

@ -14,10 +14,10 @@ set(krossui_LIB_SRCS
add_library(krossui ${LIBRARY_TYPE} ${krossui_LIB_SRCS})
target_link_libraries(krossui
krosscore
${KDE4_KDEUI_LIBS}
${KDE4_KPARTS_LIBS}
${KDE4_KIO_LIBS}
krosscore
)
set_target_properties(krossui PROPERTIES
VERSION ${GENERIC_LIB_VERSION}

2
kunitconversion/tests/CMakeLists.txt
View file

@ -5,7 +5,7 @@ macro(KUNITCONVERSION_UNIT_TESTS)
kde4_add_test(kunitconversion-${_testname} ${_testname}.cpp)
target_link_libraries(kunitconversion-${_testname}
${KDE4_KDECORE_LIBS}
kunitconversion
${KDE4_KUNITCONVERSION_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTGUI_LIBRARY}
)

22
kutils/CMakeLists.txt
View file

@ -93,14 +93,14 @@ target_link_libraries(kidletime
)
if (Q_WS_X11)
if (HAVE_XSCREENSAVER)
target_link_libraries(kidletime ${X11_Xscreensaver_LIB})
endif (HAVE_XSCREENSAVER)
if(HAVE_XSCREENSAVER)
target_link_libraries(kidletime ${X11_Xscreensaver_LIB})
endif (HAVE_XSCREENSAVER)
if (HAVE_XSYNC)
target_link_libraries(kidletime ${X11_Xext_LIB})
endif (HAVE_XSYNC)
target_link_libraries(kidletime ${X11_LIBRARIES})
if(HAVE_XSYNC)
target_link_libraries(kidletime ${X11_Xext_LIB})
endif()
target_link_libraries(kidletime ${X11_LIBRARIES})
endif (Q_WS_X11)
set_target_properties(kidletime PROPERTIES
@ -187,9 +187,11 @@ install(
add_library(kprintutils ${LIBRARY_TYPE} kprintpreview.cpp)
target_link_libraries(kprintutils PRIVATE ${KDE4_KPARTS_LIBS})
target_link_libraries(kprintutils PUBLIC kdecore kdeui ${QT_QTGUI_LIBRARY})
target_link_libraries(kprintutils
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KPARTS_LIBS}
)
set_target_properties(kprintutils PROPERTIES
VERSION ${GENERIC_LIB_VERSION}

2
kutils/kemoticons/providers/kde/CMakeLists.txt
View file

@ -8,8 +8,8 @@ include_directories(
kde4_add_plugin(emoticonstheme_kde kde_emoticons.cpp)
target_link_libraries(emoticonstheme_kde
kemoticons
${KDE4_KDEUI_LIBS}
${KDE4_KEMOTICONS_LIBS}
${QT_QTXML_LIBRARY}
)

2
kutils/kemoticons/providers/pidgin/CMakeLists.txt
View file

@ -8,8 +8,8 @@ include_directories(
kde4_add_plugin(emoticonstheme_pidgin pidgin_emoticons.cpp)
target_link_libraries(emoticonstheme_pidgin
kemoticons
${KDE4_KDEUI_LIBS}
${KDE4_KEMOTICONS_LIBS}
)
########### install files ###############

2
kutils/kemoticons/providers/xmpp/CMakeLists.txt
View file

@ -8,8 +8,8 @@ include_directories(
kde4_add_plugin(emoticonstheme_xmpp xmpp_emoticons.cpp)
target_link_libraries(emoticonstheme_xmpp
kemoticons
${KDE4_KDEUI_LIBS}
${KDE4_KEMOTICONS_LIBS}
${QT_QTXML_LIBRARY}
)

9
kutils/kemoticons/tests/CMakeLists.txt
View file

@ -5,12 +5,15 @@ include_directories(
)
kde4_add_manual_test(kutils-kemoticonstest main.cpp)
target_link_libraries(kutils-kemoticonstest ${KDE4_KDEUI_LIBS} kemoticons)
target_link_libraries(kutils-kemoticonstest
${KDE4_KDEUI_LIBS}
${KDE4_KEMOTICONS_LIBS}
)
set(kemoticontest2_SRCS kemoticontest.cpp)
kde4_add_test(kutils-kemoticontest2 ${kemoticontest2_SRCS})
target_link_libraries(kutils-kemoticontest2
${QT_QTTEST_LIBRARY}
${KDE4_KIO_LIBS}
kemoticons
${KDE4_KEMOTICONS_LIBS}
${QT_QTTEST_LIBRARY}
)

11
kutils/kmediaplayer/CMakeLists.txt
View file

@ -1,13 +1,9 @@
set(kmediaplayer_OPTIONAL_LIBS)
if(MPV_FOUND)
include_directories(${MPV_INCLUDES})
add_definitions(-DHAVE_MPV)
set(kmediaplayer_OPTIONAL_LIBS ${MPV_LIBRARIES})
endif()
add_definitions(
-DKDE_DEFAULT_DEBUG_AREA=940
)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=940)
set(kmediaplayer_LIB_SRCS
kmediaplayer.cpp
@ -19,9 +15,12 @@ add_library(kmediaplayer ${LIBRARY_TYPE} ${kmediaplayer_LIB_SRCS})
target_link_libraries(kmediaplayer
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${kmediaplayer_OPTIONAL_LIBS}
)
if(MPV_FOUND)
target_link_libraries(kmediaplayer ${MPV_LIBRARIES})
endif()
set_target_properties(kmediaplayer PROPERTIES
VERSION ${KDE_NON_GENERIC_LIB_VERSION}
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}

10
plasma/tests/CMakeLists.txt
View file

@ -2,11 +2,11 @@ MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_test(plasma-${_testname} ${_testname}.cpp)
target_link_libraries(plasma-${_testname}
${QT_QTTEST_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS}
plasma
${KDE4_PLASMA_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY}
)
if(QT_QTOPENGL_FOUND)
target_link_libraries(plasma-${_testname} ${QT_QTOPENGL_LIBRARY})
@ -30,11 +30,11 @@ set(storatetest_SRCS
kde4_add_test(plasma-storagetest ${storatetest_SRCS})
target_link_libraries(plasma-storagetest
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY}
${QT_QTSQL_LIBRARY}
${KDE4_KIO_LIBS}
plasma
)
if(QT_QTOPENGL_FOUND)

16
plasma/tests/testcontainmentactionsplugin/CMakeLists.txt
View file

@ -1,21 +1,15 @@
project(plasma-containmentactions-test)
project(plasma_testengine_dataengine)
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES})
set(test_SRCS
test.cpp
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
)
kde4_add_ui_files(test_SRCS config.ui)
kde4_add_plugin(plasma_containmentactions_test ${test_SRCS})
kde4_add_plugin(plasma_containmentactions_test test.cpp)
target_link_libraries(plasma_containmentactions_test ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS plasma_containmentactions_test DESTINATION ${PLUGIN_INSTALL_DIR})

22
plasma/tests/testengine/CMakeLists.txt
View file

@ -1,22 +1,20 @@
project(plasma_testengine_dataengine)
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES})
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
)
set(testengine_engine_SRCS
testengine.cpp)
kde4_add_plugin(plasma_engine_testengine
${testengine_engine_SRCS})
kde4_add_plugin(plasma_engine_testengine testengine.cpp)
target_link_libraries(plasma_engine_testengine
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS})
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
)
install(TARGETS plasma_engine_testengine DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-dataengine-testengine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install(FILES plasma-dataengine-testengine.desktop DESTINATION ${SERVICES_INSTALL_DIR})

20
threadweaver/Examples/Construction/CMakeLists.txt
View file

@ -1,14 +1,14 @@
include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Weaver/)
include_directories( ../../Weaver/ )
set(Construction_SRCS
Construction.cpp
include_directories(
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Weaver
../../Weaver
)
add_executable(Construction Construction.cpp)
add_executable(Construction ${Construction_SRCS})
target_link_libraries(Construction ${KDE4_THREADWEAVER_LIBS})
target_link_libraries(Construction threadweaver)
install(TARGETS Construction DESTINATION ${BIN_INSTALL_DIR} )
install(TARGETS Construction DESTINATION ${BIN_INSTALL_DIR})

29
threadweaver/Examples/Jobs/CMakeLists.txt
View file

@ -1,21 +1,28 @@
include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Weaver/ ${CMAKE_SOURCE_DIR}/WeaverGui/ ${KDE4_INCLUDES})
include_directories( ../../Weaver/ )
include_directories( ../../WeaverGui/ )
include_directories(
${KDE4_INCLUDES}
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Weaver
${CMAKE_SOURCE_DIR}/WeaverGui
../../Weaver
../../WeaverGui
)
set(Jobs_SRCS
Jobs.cpp
WeaverObserverTest.cpp
)
set( Jobs_SRCS_UI
JobsBase.ui
)
qt4_wrap_ui(Jobs_SRCS ${Jobs_SRCS_UI} )
add_executable(Jobs ${Jobs_SRCS})
target_link_libraries(Jobs ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} threadweaver ThreadWeaverGui)
target_link_libraries(Jobs
${KDE4_KDECORE_LIBS}
${KDE4_THREADWEAVER_LIBS}
${QT_QTGUI_LIBRARY}
ThreadWeaverGui
)
install(TARGETS Jobs DESTINATION ${BIN_INSTALL_DIR} )

28
threadweaver/Examples/QProcessJob/CMakeLists.txt
View file

@ -1,5 +1,14 @@
include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Weaver/ ${CMAKE_SOURCE_DIR}/Action/ ${KDE4_INCLUDES})
include_directories( ../../Weaver/ )
include_directories(
${KDE4_INCLUDES}
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Weaver
${CMAKE_SOURCE_DIR}/Action
../../Weaver
)
set(QProcessJob_SRCS
QProcessJob.cpp
@ -7,15 +16,12 @@ set(QProcessJob_SRCS
main.cpp
)
set( QProcessJob_SRCS_UI
MainWindowUi.ui
)
qt4_wrap_ui(QProcessJob_SRCS ${QProcessJob_SRCS_UI} )
add_executable(QProcessJob ${QProcessJob_SRCS})
target_link_libraries(QProcessJob ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} threadweaver)
target_link_libraries(QProcessJob
${KDE4_KDECORE_LIBS}
${KDE4_THREADWEAVER_LIBS}
${QT_QTGUI_LIBRARY}
)
install(TARGETS QProcessJob DESTINATION ${BIN_INSTALL_DIR} )
install(TARGETS QProcessJob DESTINATION ${BIN_INSTALL_DIR})

10
threadweaver/Examples/SMIV/CMakeLists.txt
View file

@ -21,18 +21,12 @@ set(SMIV_SRCS
ComputeThumbNailJob.cpp
)
set( SMIV_SRCS_UI
SMIVBase.ui
)
qt4_wrap_ui(SMIV_SRCS ${SMIV_SRCS_UI})
add_executable(SMIV ${SMIV_SRCS})
target_link_libraries(SMIV
${QT_QTGUI_LIBRARY}
${KDE4_KDECORE_LIBS}
threadweaver
${KDE4_THREADWEAVER_LIBS}
${QT_QTGUI_LIBRARY}
ThreadWeaverExperimental
)

6
threadweaver/Tests/CMakeLists.txt
View file

@ -17,8 +17,8 @@ set(JobTests_SRCS
kde4_add_test(ThreadWeaverJobTests ${JobTests_SRCS})
target_link_libraries(ThreadWeaverJobTests
${KDE4_THREADWEAVER_LIBS}
${QT_QTTEST_LIBRARY}
threadweaver
)
########### next target ###############
@ -31,9 +31,9 @@ set(QueueTests_SRCS
kde4_add_test(ThreadWeaverQueueTests ${QueueTests_SRCS})
target_link_libraries(ThreadWeaverQueueTests
${KDE4_THREADWEAVER_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
threadweaver
)
########### next target ###############
@ -46,7 +46,7 @@ set(DeleteTest_SRCS
kde4_add_test(ThreadWeaverDeleteTest ${DeleteTest_SRCS})
target_link_libraries(ThreadWeaverDeleteTest
${KDE4_THREADWEAVER_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
threadweaver
)