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 2016-09-03 00:05:54 +00:00
parent 35a5ce1afe
commit 1e26bf4a5d
19 changed files with 62 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cmake/modules/FindKDE4Internal.cmake
View file

@ -42,27 +42,28 @@
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
#
# KDE4_KDECORE_LIBRARY - the kdecore library
# KDE4_KDEUI_LIBRARY - the kdeui library
# KDE4_KIO_LIBRARY - the kio library
# KDE4_KPARTS_LIBRARY - the kparts library
# KDE4_KEMOTICONS_LIBRARY - the kemoticons library
# KDE4_KIDLETIME_LIBRARY - the kidletime library
# KDE4_KCMUTILS_LIBRARY - the kcmutils library
# KDE4_KPRINTUTILS_LIBRARY - the kprintutils library
# KDE4_KFILE_LIBRARY - the kfile library
# KDE4_KDNSSD_LIBRARY - the kdnssd library
# KDE4_THREADWEAVER_LIBRARY- the threadweaver library
# KDE4_SOLID_LIBRARY - the solid library
# KDE4_KNOTIFYCONFIG_LIBRARY- the knotifyconfig library
# KDE4_KROSSCORE_LIBRARY - the krosscore library
# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library
# KDE4_PLASMA_LIBRARY - the plasma library
# KDE4_KDECORE_LIBRARY - the kdecore library
# KDE4_KDEUI_LIBRARY - the kdeui library
# KDE4_KIO_LIBRARY - the kio library
# KDE4_KPARTS_LIBRARY - the kparts library
# KDE4_KEMOTICONS_LIBRARY - the kemoticons library
# KDE4_KIDLETIME_LIBRARY - the kidletime library
# KDE4_KCMUTILS_LIBRARY - the kcmutils library
# KDE4_KPRINTUTILS_LIBRARY - the kprintutils library
# KDE4_KFILE_LIBRARY - the kfile library
# KDE4_KDNSSD_LIBRARY - the kdnssd library
# KDE4_THREADWEAVER_LIBRARY - the threadweaver library
# KDE4_SOLID_LIBRARY - the solid library
# KDE4_KNOTIFYCONFIG_LIBRARY - the knotifyconfig library
# KDE4_KROSSCORE_LIBRARY - the krosscore library
# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library
# KDE4_PLASMA_LIBRARY - the plasma library
# KDE4_KUNITCONVERSION_LIBRARY - the kunitconversion library
# KDE4_KDEWEBKIT_LIBRARY - the kdewebkit library
# KDE4_KCDDB_LIBRARY - the kcddb library
# KDE4_KDCRAW_LIBRARY - the kdcraw library
# KDE4_KEXIV2_LIBRARY - the kexiv2 library
# KDE4_KDEWEBKIT_LIBRARY - the kdewebkit library
# KDE4_KCDDB_LIBRARY - the kcddb library
# KDE4_KDCRAW_LIBRARY - the kdcraw library
# KDE4_KEXIV2_LIBRARY - the kexiv2 library
# KDE4_KMEDIAPLAYER_LIBRARY - the kmediaplayer library
#
# Compared to the variables above, the following variables
# also contain all of the depending libraries, so the variables below
@ -91,6 +92,7 @@
# KDE4_KCDDB_LIBS - the kcddb library and all depending libraries
# KDE4_KDCRAW_LIBS - the kdcraw library and all depending libraries
# KDE4_KEXIV2_LIBS - the kexiv2 library and all depending libraries
# KDE4_KMEDIAPLAYER_LIBS - the kmediaplayer library and all depending libraries
#
# This module defines also a bunch of variables used as locations for install directories
# for files of the package which is using this module. These variables don't say
@ -400,6 +402,7 @@ endif(_kdeBootStrapping)
# In bootstrapping mode KDE4_TARGET_PREFIX is empty, so e.g. KDE4_KDECORE_LIBRARY
# will be simply set to "kdecore".
set(_kde_libraries
kmediaplayer
kcddb
kcmutils
kdcraw

4
interfaces/ktexteditor/CMakeLists.txt
View file

@ -34,11 +34,11 @@ set(ktexteditor_LIB_SRCS
add_library(ktexteditor ${LIBRARY_TYPE} ${ktexteditor_LIB_SRCS})
target_link_libraries(ktexteditor PRIVATE
target_link_libraries(ktexteditor
${KDE4_KDECORE_LIBS}
${KDE4_KPARTS_LIBS}
${QT_QTDBUS_LIBRARY}
)
target_link_libraries(ktexteditor PUBLIC ${KDE4_KPARTS_LIBS})
set_target_properties(ktexteditor PROPERTIES
VERSION ${GENERIC_LIB_VERSION}

4
interfaces/terminal/example/CMakeLists.txt
View file

@ -4,14 +4,14 @@ find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES})
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
########### next target ###############
set(hello_SRCS main.cc )
add_executable(tetest ${hello_SRCS})
target_link_libraries(tetest ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} kdeui )
target_link_libraries(tetest ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS})
########### install files ###############

3
kcddb/kcmcddb/CMakeLists.txt
View file

@ -6,14 +6,13 @@ include_directories(
set(kcm_cddb_PART_SRCS
cddbconfigwidget.cpp
kcmcddb.cpp
cddbconfigwidget.ui
)
kde4_add_plugin(kcm_cddb ${kcm_cddb_PART_SRCS})
target_link_libraries(kcm_cddb
${KDE4_KIO_LIBS}
kcddb
${KDE4_KCDDB_LIBS}
)
install(

2
kcddb/libkcddb/CMakeLists.txt
View file

@ -30,7 +30,7 @@ set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
kde4_add_kcfg_files(kcddb_LIB_SRCS configbase.kcfgc)
add_library(kcddb SHARED ${kcddb_LIB_SRCS})
add_library(kcddb ${LIBRARY_TYPE} ${kcddb_LIB_SRCS})
target_link_libraries(kcddb ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
if(MUSICBRAINZ5_FOUND)

4
kcddb/test/CMakeLists.txt
View file

@ -9,8 +9,8 @@ MACRO(KCDDB_EXECUTABLE_TESTS)
kde4_add_manual_test(kcddb-${_testname} ${_testname}.cpp)
target_link_libraries(kcddb-${_testname}
${KDE4_KDEUI_LIBS}
${KDE4_KCDDB_LIBS}
${QT_QTTEST_LIBRARY}
kcddb
)
ENDFOREACH(_testname)
ENDMACRO(KCDDB_EXECUTABLE_TESTS)
@ -19,8 +19,8 @@ MACRO(KCDDB_UNIT_TESTS)
kde4_add_test(kcddb-${_testname} ${_testname}.cpp)
target_link_libraries(kcddb-${_testname}
${KDE4_KDEUI_LIBS}
${KDE4_KCDDB_LIBS}
${QT_QTTEST_LIBRARY}
kcddb
)
ENDFOREACH(_testname)
ENDMACRO(KCDDB_UNIT_TESTS)

5
kdcraw/libkdcraw/CMakeLists.txt
View file

@ -46,12 +46,9 @@ set(kdcraw_LIB_SRCS
add_library(kdcraw ${LIBRARY_TYPE} ${kdcraw_LIB_SRCS})
target_link_libraries(kdcraw PRIVATE
target_link_libraries(kdcraw
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
)
target_link_libraries(kdcraw PUBLIC
${LibRaw_r_LIBRARIES}
)

2
kdeclarative/CMakeLists.txt
View file

@ -27,7 +27,7 @@ set(kdeclarative_LIB_SRCS
bindings/url.cpp
)
add_library(kdeclarative SHARED ${kdeclarative_LIB_SRCS})
add_library(kdeclarative ${LIBRARY_TYPE} ${kdeclarative_LIB_SRCS})
set_target_properties(kdeclarative PROPERTIES
VERSION ${GENERIC_LIB_VERSION}

2
kdecore/sonnet/tests/CMakeLists.txt
View file

@ -7,7 +7,7 @@ set(test_suggest_SRCS test.cpp)
kde4_add_manual_test(test_suggest ${test_suggest_SRCS})
target_link_libraries(test_suggest ${KDE4_KDECORE_LIBS} )
target_link_libraries(test_suggest ${KDE4_KDECORE_LIBS})
########### unittests ###############

9
kdecore/tests/CMakeLists.txt
View file

@ -120,14 +120,14 @@ target_link_libraries(kdecore-klimitediodevicetest ${KDE4_KDECORE_LIBS} ${QT_QTT
# compile kmimemagicrule.cpp into the test since it's not exported and we call match().
set(kmimetypetest_SRCS kmimetypetest.cpp ../services/kmimemagicrule.cpp)
kde4_add_test(kdecore-kmimetypetest ${kmimetypetest_SRCS})
target_link_libraries(kdecore-kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
target_link_libraries(kdecore-kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
########### kmimeglobsfileparsertest ###############
# compile kmimeglobsfileparser.cpp into the test since it's not exported
set(kmimeglobsfileparsertest_SRCS kmimeglobsfileparsertest.cpp ../services/kmimeglobsfileparser.cpp)
kde4_add_test(kdecore-kmimeglobsfileparsertest ${kmimeglobsfileparsertest_SRCS})
target_link_libraries(kdecore-kmimeglobsfileparsertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
target_link_libraries(kdecore-kmimeglobsfileparsertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
########### kfiltertest ###############
@ -146,7 +146,10 @@ kde4_add_plugin(kdecore-klibloadertestmodule4 ${klibloadertestmodule4_PART_SRCS}
target_link_libraries(kdecore-klibloadertestmodule4 ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
set_target_properties(kdecore-klibloadertestmodule4 PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE)
set_target_properties(kdecore-klibloadertestmodule4 PROPERTIES
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
)
########### kcompositejobtest ###############

17
kdeui/CMakeLists.txt
View file

@ -367,7 +367,7 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS ${knotify_xml} knotify_interface)
add_library(kdeui ${LIBRARY_TYPE} ${kdeui_LIB_SRCS})
target_link_libraries(kdeui PRIVATE
target_link_libraries(kdeui
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
@ -377,27 +377,20 @@ target_link_libraries(kdeui PRIVATE
${KDEUI_EXTRA_LIBS}
)
target_link_libraries(kdeui PUBLIC
kdecore
${QT_QTGUI_LIBRARY}
${QT_QTSVG_LIBRARY}
)
if(X11_XTest_FOUND)
target_link_libraries(kdeui PRIVATE ${X11_XTest_LIB})
target_link_libraries(kdeui ${X11_XTest_LIB})
endif()
if(X11_Xcursor_FOUND)
target_link_libraries(kdeui PRIVATE ${X11_Xcursor_LIB})
target_link_libraries(kdeui ${X11_Xcursor_LIB})
endif()
if(X11_Xfixes_FOUND)
target_link_libraries(kdeui PRIVATE ${X11_Xfixes_LIB})
target_link_libraries(kdeui ${X11_Xfixes_LIB})
endif()
if(X11_Xrender_FOUND)
target_link_libraries(kdeui PRIVATE ${X11_Xrender_LIB})
target_link_libraries(kdeui ${X11_Xrender_LIB})
endif()
set_target_properties(kdeui PROPERTIES

16
kdeui/tests/krichtexteditor/CMakeLists.txt
View file

@ -1,14 +1,18 @@
PROJECT(krichtexteditor)
FIND_PACKAGE(KDE4 REQUIRED)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
project(krichtexteditor)
SET(krichtexteditorSources
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
set(krichtexteditorSources
main.cpp
krichtexteditor.cpp
)
KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources})
TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
add_executable(krichtexteditor ${krichtexteditorSources})
target_link_libraries(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR})
install(FILES krichtexteditorui.rc DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor)

2
kdewidgets/CMakeLists.txt
View file

@ -39,7 +39,7 @@ if(QT_QTDESIGNER_FOUND)
kde4_add_plugin(kdewidgets ${kdewidgets_SRCS})
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS} kmediaplayer)
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS} ${KDE4_KMEDIAPLAYER_LIBS})
install(
TARGETS kdewidgets

3
kexiv2/libkexiv2/CMakeLists.txt
View file

@ -52,12 +52,11 @@ set(kexiv2_LIB_SRCS
rotationmatrix.cpp
)
add_library(kexiv2 SHARED ${kexiv2_LIB_SRCS})
add_library(kexiv2 ${LIBRARY_TYPE} ${kexiv2_LIB_SRCS})
target_link_libraries(kexiv2
${KDE4_KDEUI_LIBS}
${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${EXIV2_LIBRARIES}
)

2
kinit/tests/CMakeLists.txt
View file

@ -2,4 +2,4 @@ include_directories(${KDE4_KIO_INCLUDES})
kde4_add_manual_test(klaunchertest klaunchertest.cpp)
target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} kio)
target_link_libraries(klaunchertest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})

3
kio/CMakeLists.txt
View file

@ -224,13 +224,12 @@ set(kio_LIB_PRIVATE_SRCS
add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
target_link_libraries(kio
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${ZLIB_LIBRARY}
${QT_QTSVG_LIBRARY}
${X11_LIBRARIES}
${KIO_EXTRA_LIBS}
kdeui
kdecore
${QT_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTGUI_LIBRARY}

2
kioslave/file/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(kio_file_PART_SRCS file.cpp file_unix.cpp)
kde4_add_plugin(kio_file ${kio_file_PART_SRCS})
target_link_libraries(kio_file ${KDE4_KDECORE_LIBS} kio)
target_link_libraries(kio_file ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
if (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
target_link_libraries(kio_file -lvolmgt)

2
kioslave/ftp/CMakeLists.txt
View file

@ -6,7 +6,7 @@ include_directories(${KDE4_KIO_INCLUDES})
kde4_add_plugin(kio_ftp ftp.cpp)
target_link_libraries(kio_ftp ${KDE4_KDECORE_LIBS} kio)
target_link_libraries(kio_ftp ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS kio_ftp DESTINATION ${PLUGIN_INSTALL_DIR})

2
kutils/kmediaplayer/tests/CMakeLists.txt
View file

@ -6,5 +6,5 @@ foreach(mantest media)
kde4_add_manual_test(kmediaplayer-${mantest}
k${mantest}widgettest.cpp
)
target_link_libraries(kmediaplayer-${mantest} kmediaplayer)
target_link_libraries(kmediaplayer-${mantest} ${KDE4_KMEDIAPLAYER_LIBS})
endforeach()