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: merge KDELibs4ToolsTargets and KDELibs4LibraryTargets

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-17 23:57:38 +03:00
parent 61f31a7a00
commit ed79c859b2
25 changed files with 35 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -508,15 +508,9 @@ install(
) )
install( install(
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
NAMESPACE ${KDE4_TARGET_PREFIX} NAMESPACE ${KDE4_TARGET_PREFIX}
FILE KDELibs4LibraryTargets.cmake FILE KDELibs4Targets.cmake
DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/KDELibs4
)
install(
EXPORT kdelibsToolsTargets
NAMESPACE ${KDE4_TARGET_PREFIX}
FILE KDELibs4ToolsTargets.cmake
DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/KDELibs4 DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/KDELibs4
) )

21
KDELibs4Config.cmake
View file

@ -96,8 +96,8 @@ if(NOT KDELIBS4_FOUND)
find_package(Katie QUIET REQUIRED 4.13.0) find_package(Katie QUIET REQUIRED 4.13.0)
find_package(X11 QUIET REQUIRED) find_package(X11 QUIET REQUIRED)
# add the found Katie and KDE include directories to the current include path # add the found KDE, Katie and X11 include directories to KDE4_INCLUDES, the
# the ${KDE4_INCLUDE_INSTALL_DIR}/KDE directory is for forwarding includes, e.g. # ${KDE4_INCLUDE_INSTALL_DIR}/KDE directory is for forwarding includes, e.g.
# #include <KMainWindow> # #include <KMainWindow>
set(KDE4_INCLUDES set(KDE4_INCLUDES
${KDE4_INCLUDE_INSTALL_DIR} ${KDE4_INCLUDE_INSTALL_DIR}
@ -135,22 +135,15 @@ if(NOT KDELIBS4_FOUND)
# KDE4Defaults.cmake contains KDE defaults # KDE4Defaults.cmake contains KDE defaults
include(${kdelibs4_config_dir}/KDE4Defaults.cmake) include(${kdelibs4_config_dir}/KDE4Defaults.cmake)
# Now include the file with the imported tools (executable targets). # This file contains the exported library and tools targets from kdelibs, e.g. the library
# This export-file is generated and installed by the toplevel CMakeLists.txt of kdelibs. # target "kdeui" is exported as "KDE4::kdeui". The "KDE4::" is used as "namespace" to separate
# Having the libs and tools in two separate files should help with cross compiling. # the imported targets from "normal" targets, it is stored in KDE4_TARGET_PREFIX. This
include(${kdelibs4_config_dir}/KDELibs4ToolsTargets.cmake) # export-file is generated and installed by the toplevel
include(${kdelibs4_config_dir}/KDELibs4Targets.cmake)
set(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler) set(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler)
set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets) set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets)
# This file contains the exported library target from kdelibs (new with cmake 2.6.x), e.g.
# the library target "kdeui" is exported as "KDE4::kdeui". The "KDE4::" is used as
# "namespace" to separate the imported targets from "normal" targets, it is stored in
# KDE4_TARGET_PREFIX.
# This export-file is generated and installed by the toplevel CMakeLists.txt of kdelibs.
# Include it to "import" the libraries from kdelibs into the current projects as targets.
include(${kdelibs4_config_dir}/KDELibs4LibraryTargets.cmake)
# KDE4Macros.cmake contains all the KDE specific macros # KDE4Macros.cmake contains all the KDE specific macros
include(${kdelibs4_config_dir}/KDE4Macros.cmake) include(${kdelibs4_config_dir}/KDE4Macros.cmake)

5
cmake/modules/KDE4Defaults.cmake
View file

@ -14,22 +14,17 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
cmake_policy(SET CMP0071 OLD) cmake_policy(SET CMP0071 OLD)
endif() endif()
# let cmake handle mocking and UI compiling # let cmake handle mocking and UI compiling
# since cmake 2.8.6
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
# since cmake 3.0.0
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
# always include srcdir and builddir in include path, this saves typing # always include srcdir and builddir in include path, this saves typing
# ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in about every subdir # ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in about every subdir
# since cmake 2.4.0
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# put the include dirs which are in the source or build tree before all other # put the include dirs which are in the source or build tree before all other
# include dirs, so the headers in the sources are preferred over the already # include dirs, so the headers in the sources are preferred over the already
# installed ones # installed ones
# since cmake 2.4.1
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
# do not duplicate interface includes as system from projects providing # do not duplicate interface includes as system from projects providing

2
interfaces/ktexteditor/CMakeLists.txt
View file

@ -48,7 +48,7 @@ set_target_properties(ktexteditor PROPERTIES
) )
install( install(
TARGETS ktexteditor TARGETS ktexteditor
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kdeclarative/CMakeLists.txt
View file

@ -59,6 +59,6 @@ install(
install( install(
TARGETS kdeclarative TARGETS kdeclarative
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kdecore/CMakeLists.txt
View file

@ -183,7 +183,7 @@ set_target_properties(kdecore PROPERTIES
install( install(
TARGETS kdecore TARGETS kdecore
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kdecore/kconfig_compiler/CMakeLists.txt
View file

@ -7,6 +7,6 @@ target_link_libraries(kconfig_compiler
install( install(
TARGETS kconfig_compiler TARGETS kconfig_compiler
EXPORT kdelibsToolsTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_BIN_INSTALL_DIR} DESTINATION ${KDE4_BIN_INSTALL_DIR}
) )

2
kdeui/CMakeLists.txt
View file

@ -370,7 +370,7 @@ generate_export_header(kdeui)
install( install(
TARGETS kdeui TARGETS kdeui
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

12
kdeui/tests/CMakeLists.txt
View file

@ -135,16 +135,12 @@ KDEUI_EXECUTABLE_TESTS(
kcompletionuitest kcompletionuitest
kmainwindowrestoretest kmainwindowrestoretest
kmainwindowtest kmainwindowtest
fixx11h_test
fixx11h_test2
kxerrorhandlertest
) )
if (Q_WS_X11) target_link_libraries(kdeui-kxerrorhandlertest ${X11_X11_LIB})
KDEUI_EXECUTABLE_TESTS(
fixx11h_test
fixx11h_test2
kxerrorhandlertest
)
target_link_libraries(kdeui-kxerrorhandlertest ${X11_X11_LIB})
endif (Q_WS_X11)
## kcolorutilsdemo ## kcolorutilsdemo

2
kdewidgets/CMakeLists.txt
View file

@ -20,7 +20,7 @@ target_link_libraries(makekdewidgets kdecore)
install( install(
TARGETS makekdewidgets TARGETS makekdewidgets
EXPORT kdelibsToolsTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_BIN_INSTALL_DIR} DESTINATION ${KDE4_BIN_INSTALL_DIR}
) )

2
kfile/CMakeLists.txt
View file

@ -57,7 +57,7 @@ set_target_properties(kfile PROPERTIES
install( install(
TARGETS kfile TARGETS kfile
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kio/CMakeLists.txt
View file

@ -154,7 +154,7 @@ set_target_properties(kio PROPERTIES
install( install(
TARGETS kio TARGETS kio
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
knotify/CMakeLists.txt
View file

@ -35,7 +35,7 @@ set_target_properties(knotifyconfig PROPERTIES
) )
install( install(
TARGETS knotifyconfig TARGETS knotifyconfig
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kparts/CMakeLists.txt
View file

@ -37,7 +37,7 @@ set_target_properties(kparts PROPERTIES
install( install(
TARGETS kparts TARGETS kparts
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kpty/CMakeLists.txt
View file

@ -24,7 +24,7 @@ set_target_properties(kpty PROPERTIES
) )
install( install(
TARGETS kpty TARGETS kpty
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

4
kutils/CMakeLists.txt
View file

@ -79,7 +79,7 @@ install(
install( install(
TARGETS kidletime TARGETS kidletime
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )
@ -136,6 +136,6 @@ install(
install( install(
TARGETS kcmutils TARGETS kcmutils
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/karchive/CMakeLists.txt
View file

@ -58,7 +58,7 @@ install(
install( install(
TARGETS karchive TARGETS karchive
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kdnssd/CMakeLists.txt
View file

@ -35,6 +35,6 @@ install(
install( install(
TARGETS kdnssd TARGETS kdnssd
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kemail/CMakeLists.txt
View file

@ -39,6 +39,6 @@ install(
install( install(
TARGETS kemail TARGETS kemail
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kexiv2/CMakeLists.txt
View file

@ -40,7 +40,7 @@ install(
install( install(
TARGETS kexiv2 TARGETS kexiv2
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kmediaplayer/CMakeLists.txt
View file

@ -43,7 +43,7 @@ install(
install( install(
TARGETS kmediaplayer TARGETS kmediaplayer
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kpasswdstore/CMakeLists.txt
View file

@ -41,7 +41,7 @@ install(
install( install(
TARGETS kpasswdstore TARGETS kpasswdstore
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
kutils/kpowermanager/CMakeLists.txt
View file

@ -33,7 +33,7 @@ install(
install( install(
TARGETS kpowermanager TARGETS kpowermanager
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
plasma/CMakeLists.txt
View file

@ -174,7 +174,7 @@ set_target_properties(plasma PROPERTIES
install( install(
TARGETS plasma TARGETS plasma
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )

2
solid/solid/CMakeLists.txt
View file

@ -209,7 +209,7 @@ set_target_properties(solid PROPERTIES
) )
install( install(
TARGETS solid TARGETS solid
EXPORT kdelibsLibraryTargets EXPORT kdelibsTargets
DESTINATION ${KDE4_LIB_INSTALL_DIR} DESTINATION ${KDE4_LIB_INSTALL_DIR}
) )