mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 10:22:48 +00:00
generic: fix most of the overlinking issues
TODO from https://github.com/fluxer/katana/issues/7. I've decided to keep KDE4 and Katie libraries as PUBLIC, all other libraries as PRIVATE for that and not use INTERFACE at all since that will not require a lot of changes to all other sub-projects (kde-baseapps, kde-workspace and kde-extraapps) build systems. MusicBrainz5 CMake module was also rewritten as the actual library that should be linked to is libmusicbrainz5cc, libmusicbrainz5 is the C version of it. common checks for X11 extensions where move to main config header, eventually to be moved to separate config-x11 header. Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev
parent
9dcca4fe37
commit
4d6fb007e7
35 changed files with 134 additions and 137 deletions
|
|
@ -76,12 +76,17 @@ set_package_properties(ENCHANT PROPERTIES
|
|||
|
||||
# optional features
|
||||
if(X11_FOUND)
|
||||
#X11_Xrender discovery is done by FindX11
|
||||
add_feature_info("X Rendering Extension (libXrender)" X11_Xrender_FOUND "Support for compositing, rendering operations, and alpha-blending. STRONGLY RECOMMENDED")
|
||||
macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST)
|
||||
macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR)
|
||||
macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES)
|
||||
macro_bool_to_01(X11_Xscreensaver_FOUND HAVE_XSCREENSAVER)
|
||||
macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC)
|
||||
|
||||
add_feature_info("X Test Extension (libXTest)" HAVE_XTEST "Support for notfication restriction")
|
||||
add_feature_info("X Cursor Extension (Xcursor)" HAVE_XTEST "Support for loading cursors depending on theme")
|
||||
add_feature_info("X Fixes Extension (libXfixes)" HAVE_XFIXES "Support for damage/fixes cursor and window management")
|
||||
add_feature_info("X Screensaver Extension (libXss)" HAVE_XSCREENSAVER "Support for KIdleTime (fallback mode)")
|
||||
add_feature_info("X Sync Extension (libXext)" HAVE_XSYNC "Efficient operation of KIdleTime. STRONGLY RECOMMENDED")
|
||||
add_feature_info("X Sync Extension (libXext)" HAVE_XSYNC "Efficient operation of KIdleTime")
|
||||
|
||||
if(NOT HAVE_XSYNC AND NOT HAVE_XSCREENSAVER)
|
||||
message(FATAL_ERROR "\nNeither the XSync (libXext) nor XScreensaver (libXss) development package was found.\nPlease install one of them (XSync is recommended)\n")
|
||||
|
|
|
|||
|
|
@ -44,10 +44,12 @@ check_include_files(errno.h HAVE_ERRNO_H) # various
|
|||
check_include_files(sys/time.h HAVE_SYS_TIME_H) # various
|
||||
check_include_files(langinfo.h HAVE_LANGINFO_H) # kdecore
|
||||
|
||||
# TODO: separate to config-x11.h
|
||||
macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # kdecore
|
||||
macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # kdeui
|
||||
macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # kdeui
|
||||
macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kio
|
||||
macro_bool_to_01(X11_Xscreensaver_FOUND HAVE_XSCREENSAVER) # kidletime
|
||||
macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kidletime
|
||||
|
||||
|
||||
# Use check_symbol_exists to check for symbols in a reliable
|
||||
|
|
|
|||
|
|
@ -1,32 +1,44 @@
|
|||
# Module to find the musicbrainz-4 library
|
||||
# - Try to find MusicBrainz
|
||||
# Once done this will define
|
||||
#
|
||||
# It defines
|
||||
# MUSICBRAINZ5_INCLUDE_DIRS - the include dirs
|
||||
# MUSICBRAINZ5_LIBRARIES - the required libraries
|
||||
# MUSICBRAINZ5_FOUND - true if both of the above have been found
|
||||
|
||||
# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
|
||||
# MUSICBRAINZ5_FOUND - system has MusicBrainz
|
||||
# MUSICBRAINZ5_INCLUDE_DIR - the MusicBrainz include directory
|
||||
# MUSICBRAINZ5_LIBRARIES - The libraries needed to use MusicBrainz
|
||||
#
|
||||
# Copyright (c) 2020, Ivailo Monev, <xakepa10@gmail.com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
if(MUSICBRAINZ5_INCLUDE_DIRS AND MUSICBRAINZ5_LIBRARIES)
|
||||
set(MUSICBRAINZ5_FIND_QUIETLY TRUE)
|
||||
endif(MUSICBRAINZ5_INCLUDE_DIRS AND MUSICBRAINZ5_LIBRARIES)
|
||||
if(MUSICBRAINZ5_INCLUDE_DIR AND MUSICBRAINZ5_LIBRARIES)
|
||||
set(MUSICBRAINZ5_FIND_QUIETLY TRUE)
|
||||
endif()
|
||||
|
||||
IF (NOT WIN32)
|
||||
# use pkg-config to get the directories and then use these values
|
||||
# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||
find_package(PkgConfig)
|
||||
PKG_SEARCH_MODULE( MUSICBRAINZ5 libmusicbrainz5 )
|
||||
ELSE (NOT WIN32)
|
||||
FIND_PATH( MUSICBRAINZ5_INCLUDE_DIRS musicbrainz5/Disc.h )
|
||||
FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5 )
|
||||
ENDIF (NOT WIN32)
|
||||
if(NOT WIN32)
|
||||
include(FindPkgConfig)
|
||||
pkg_check_modules(PC_MUSICBRAINZ5 QUIET libmusicbrainz5)
|
||||
endif()
|
||||
|
||||
find_path(MUSICBRAINZ5_INCLUDE_DIR
|
||||
NAMES
|
||||
musicbrainz5/Disc.h
|
||||
HINTS
|
||||
$ENV{MUSICBRAINZ5DIR}/include
|
||||
${PC_MUSICBRAINZ5_INCLUDEDIR}
|
||||
${INCLUDE_INSTALL_DIR}
|
||||
)
|
||||
|
||||
find_library(MUSICBRAINZ5_LIBRARIES
|
||||
musicbrainz5cc musicbrainz5
|
||||
HINTS
|
||||
$ENV{MUSICBRAINZ5DIR}/lib
|
||||
${PC_MUSICBRAINZ5_LIBDIR}
|
||||
${LIB_INSTALL_DIR}
|
||||
)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args( MusicBrainz5 DEFAULT_MSG
|
||||
MUSICBRAINZ5_INCLUDE_DIRS MUSICBRAINZ5_LIBRARIES)
|
||||
|
||||
MARK_AS_ADVANCED(MUSICBRAINZ5_INCLUDE_DIRS MUSICBRAINZ5_LIBRARIES)
|
||||
find_package_handle_standard_args(MusicBrainz5
|
||||
VERSION_VAR PC_MUSICBRAINZ5_VERSION
|
||||
REQUIRED_VARS MUSICBRAINZ5_LIBRARIES MUSICBRAINZ5_INCLUDE_DIR
|
||||
)
|
||||
|
||||
mark_as_advanced(MUSICBRAINZ5_INCLUDE_DIR MUSICBRAINZ5_LIBRARIES)
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@
|
|||
#cmakedefine HAVE_MNTENT_H 1
|
||||
#cmakedefine HAVE_UNISTD_H 1
|
||||
|
||||
|
||||
/* Define to 1 if you have the Xtest extension */
|
||||
#cmakedefine HAVE_XTEST 1
|
||||
|
||||
/* Define to 1 if you have the Xcursor library */
|
||||
|
|
@ -48,8 +50,11 @@
|
|||
/* Define to 1 if you have the Xfixes library */
|
||||
#cmakedefine HAVE_XFIXES 1
|
||||
|
||||
/* Define to 1 if you have the Xrender library */
|
||||
#cmakedefine HAVE_XRENDER 1
|
||||
/* Define to 1 if you have the Xscreensaver extension */
|
||||
#cmakedefine HAVE_XSCREENSAVER 1
|
||||
|
||||
/* Define to 1 if you have the XSync extension */
|
||||
#cmakedefine HAVE_XSYNC 1
|
||||
|
||||
#cmakedefine HAVE_BACKTRACE 1
|
||||
#cmakedefine HAVE_GETMNTINFO 1
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ set_package_properties(MusicBrainz5 PROPERTIES
|
|||
|
||||
if(MUSICBRAINZ5_FOUND)
|
||||
set(HAVE_MUSICBRAINZ5 1)
|
||||
include_directories(${MUSICBRAINZ5_INCLUDE_DIRS})
|
||||
include_directories(${MUSICBRAINZ5_INCLUDE_DIR})
|
||||
|
||||
set(libmusicbrainz_SRCS
|
||||
musicbrainz/musicbrainzlookup.cpp
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
########### next target ###############
|
||||
|
||||
set(kcddb_LIB_SRCS ${libmusicbrainz_SRCS}
|
||||
set(kcddb_LIB_SRCS
|
||||
${libmusicbrainz_SRCS}
|
||||
cache.cpp
|
||||
cdinfo.cpp
|
||||
kcddbconfig.cpp
|
||||
|
|
@ -32,9 +33,13 @@ kde4_add_kcfg_files(kcddb_LIB_SRCS configbase.kcfgc)
|
|||
|
||||
add_library(kcddb ${LIBRARY_TYPE} ${kcddb_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kcddb ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
|
||||
target_link_libraries(kcddb PUBLIC
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
)
|
||||
|
||||
if(MUSICBRAINZ5_FOUND)
|
||||
target_link_libraries(kcddb ${MUSICBRAINZ5_LIBRARIES})
|
||||
target_link_libraries(kcddb PRIVATE ${MUSICBRAINZ5_LIBRARIES})
|
||||
endif()
|
||||
|
||||
set_target_properties(kcddb PROPERTIES
|
||||
|
|
|
|||
|
|
@ -43,10 +43,13 @@ set(kdcraw_LIB_SRCS
|
|||
|
||||
add_library(kdcraw ${LIBRARY_TYPE} ${kdcraw_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdcraw
|
||||
target_link_libraries(kdcraw PRIVATE
|
||||
${LibRaw_r_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(kdcraw PUBLIC
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${LibRaw_r_LIBRARIES}
|
||||
)
|
||||
|
||||
set_target_properties(kdcraw PROPERTIES
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ set_target_properties(kdeclarative PROPERTIES
|
|||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
target_link_libraries(kdeclarative
|
||||
target_link_libraries(kdeclarative PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTSCRIPT_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -275,9 +275,6 @@ endif()
|
|||
add_library(kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdecore PRIVATE
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${ZLIB_LIBRARY}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${kdecore_OPTIONAL_LIBS}
|
||||
|
|
@ -288,8 +285,10 @@ if(NOT HAVE_TRUNC)
|
|||
endif()
|
||||
|
||||
target_link_libraries(kdecore PUBLIC
|
||||
${QT_QTDBUS_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTDBUS_LIBRARY}
|
||||
)
|
||||
|
||||
set_target_properties(kdecore PROPERTIES
|
||||
|
|
|
|||
|
|
@ -366,30 +366,29 @@ qt4_add_dbus_interface(kdeui_LIB_SRCS ${knotify_xml} knotify_interface)
|
|||
|
||||
add_library(kdeui ${LIBRARY_TYPE} ${kdeui_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdeui
|
||||
target_link_libraries(kdeui PRIVATE
|
||||
${X11_LIBRARIES}
|
||||
${KDEUI_EXTRA_LIBS}
|
||||
)
|
||||
|
||||
target_link_libraries(kdeui PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${X11_LIBRARIES}
|
||||
${KDEUI_EXTRA_LIBS}
|
||||
)
|
||||
|
||||
if(X11_XTest_FOUND)
|
||||
target_link_libraries(kdeui ${X11_XTest_LIB})
|
||||
target_link_libraries(kdeui PRIVATE ${X11_XTest_LIB})
|
||||
endif()
|
||||
|
||||
if(X11_Xcursor_FOUND)
|
||||
target_link_libraries(kdeui ${X11_Xcursor_LIB})
|
||||
target_link_libraries(kdeui PRIVATE ${X11_Xcursor_LIB})
|
||||
endif()
|
||||
|
||||
if(X11_Xfixes_FOUND)
|
||||
target_link_libraries(kdeui ${X11_Xfixes_LIB})
|
||||
endif()
|
||||
|
||||
if(X11_Xrender_FOUND)
|
||||
target_link_libraries(kdeui ${X11_Xrender_LIB})
|
||||
target_link_libraries(kdeui PRIVATE ${X11_Xfixes_LIB})
|
||||
endif()
|
||||
|
||||
set_target_properties(kdeui PROPERTIES
|
||||
|
|
|
|||
|
|
@ -22,22 +22,12 @@
|
|||
#include "kfadewidgeteffect.h"
|
||||
#include "kfadewidgeteffect_p.h"
|
||||
|
||||
#include <config.h> // for HAVE_XRENDER
|
||||
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtGui/QPaintEngine>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#include <kglobalsettings.h>
|
||||
|
||||
#if defined(Q_WS_X11) && defined(HAVE_XRENDER)
|
||||
# include <X11/Xlib.h>
|
||||
# include <X11/extensions/Xrender.h>
|
||||
# include <QtGui/qx11info_x11.h>
|
||||
# undef KeyPress
|
||||
# undef FocusOut
|
||||
#endif
|
||||
|
||||
KFadeWidgetEffectPrivate::KFadeWidgetEffectPrivate(QWidget *_destWidget)
|
||||
: destWidget(_destWidget), disabled(false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -54,11 +54,14 @@ set(kexiv2_LIB_SRCS
|
|||
|
||||
add_library(kexiv2 ${LIBRARY_TYPE} ${kexiv2_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kexiv2
|
||||
target_link_libraries(kexiv2 PRIVATE
|
||||
${EXIV2_LIBRARIES}
|
||||
)
|
||||
|
||||
target_link_libraries(kexiv2 PUBLIC
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${EXIV2_LIBRARIES}
|
||||
)
|
||||
|
||||
set_target_properties(kexiv2 PROPERTIES
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ set(kfile_LIB_SRCS
|
|||
|
||||
add_library(kfile ${LIBRARY_TYPE} ${kfile_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kfile
|
||||
target_link_libraries(kfile PUBLIC
|
||||
${KDE4_SOLID_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
|
|
|
|||
|
|
@ -223,24 +223,23 @@ set(kio_LIB_PRIVATE_SRCS
|
|||
|
||||
add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kio
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
target_link_libraries(kio PRIVATE
|
||||
${ZLIB_LIBRARY}
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${X11_LIBRARIES}
|
||||
${KIO_EXTRA_LIBS}
|
||||
)
|
||||
|
||||
target_link_libraries(kio PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
)
|
||||
|
||||
if(ACL_FOUND)
|
||||
target_link_libraries(kio ${ACL_LIBS})
|
||||
endif()
|
||||
|
||||
if(X11_Xrender_FOUND)
|
||||
target_link_libraries(kio ${X11_Xrender_LIB})
|
||||
target_link_libraries(kio PRIVATE ${ACL_LIBS})
|
||||
endif()
|
||||
|
||||
set_target_properties(kio PROPERTIES
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@
|
|||
#include "kfileitemdelegate.h"
|
||||
#include "imagefilter_p.h"
|
||||
|
||||
#include <config.h> // for HAVE_XRENDER
|
||||
|
||||
#include <QApplication>
|
||||
#include <QStyle>
|
||||
#include <QtCore/qabstractitemmodel.h>
|
||||
|
|
@ -49,15 +47,6 @@
|
|||
#include <ktextedit.h>
|
||||
#include <kstringhandler.h>
|
||||
|
||||
#if defined(Q_WS_X11) && defined(HAVE_XRENDER)
|
||||
# include <X11/Xlib.h>
|
||||
# include <X11/extensions/Xrender.h>
|
||||
# include <QtGui/qx11info_x11.h>
|
||||
# undef KeyPress
|
||||
# undef FocusOut
|
||||
#endif
|
||||
|
||||
|
||||
struct Margin
|
||||
{
|
||||
int left, right, top, bottom;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ set(knotifyconfig_LIB_SRCS
|
|||
add_library(knotifyconfig ${LIBRARY_TYPE} ${knotifyconfig_LIB_SRCS})
|
||||
|
||||
# Needs KIO for KUrlRequester
|
||||
target_link_libraries(knotifyconfig
|
||||
target_link_libraries(knotifyconfig PUBLIC
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KMEDIAPLAYER_LIBS}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ set(kparts_LIB_SRCS
|
|||
|
||||
add_library(kparts ${LIBRARY_TYPE} ${kparts_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kparts
|
||||
target_link_libraries(kparts PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,15 @@ set(kpty_LIB_SRCS
|
|||
|
||||
add_library(kpty ${LIBRARY_TYPE} ${kpty_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kpty
|
||||
${KDE4_KDECORE_LIBS}
|
||||
target_link_libraries(kpty PRIVATE
|
||||
${UTIL_LIBRARY}
|
||||
${UTEMPTER_LIBRARY}
|
||||
)
|
||||
|
||||
target_link_libraries(kpty PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
)
|
||||
|
||||
set_target_properties(kpty PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ set(krosscore_LIB_SRCS
|
|||
|
||||
add_library(krosscore ${LIBRARY_TYPE} ${krosscore_LIB_SRCS})
|
||||
|
||||
target_link_libraries(krosscore
|
||||
target_link_libraries(krosscore PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTSCRIPT_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ if(QT_QTDESIGNER_FOUND)
|
|||
${KDE4_KPARTS_LIBS}
|
||||
${KDE4_KFILE_LIBS}
|
||||
krosscore
|
||||
krossui
|
||||
)
|
||||
install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <QtGui/QSizePolicy>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QProgressBar>
|
||||
//#include <QtGui/QProgressDialog>
|
||||
#include <QtGui/QTextBrowser>
|
||||
#include <QUiLoader>
|
||||
#include <QTextCursor>
|
||||
|
|
@ -44,9 +43,6 @@
|
|||
#include <klocale.h>
|
||||
#include <kurl.h>
|
||||
#include <kpushbutton.h>
|
||||
//#include <kurlcombobox.h>
|
||||
//#include <kdiroperator.h>
|
||||
//#include <kshell.h>
|
||||
#include <kicon.h>
|
||||
#include <kaction.h>
|
||||
#include <kactioncollection.h>
|
||||
|
|
@ -54,10 +50,6 @@
|
|||
#include <kpluginloader.h>
|
||||
#include <kpluginfactory.h>
|
||||
#include <kparts/part.h>
|
||||
//#include <kio/netaccess.h>
|
||||
//#include <klocale.h>
|
||||
//#include <kmimetype.h>
|
||||
//#include <kstandarddirs.h>
|
||||
#include <kfilewidget.h>
|
||||
#include <kurlcombobox.h>
|
||||
#include <kshell.h>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
|
||||
#include <kpagedialog.h>
|
||||
#include <kassistantdialog.h>
|
||||
//#include <kfilewidget.h>
|
||||
|
||||
namespace Kross {
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
#include <QtCore/qvariant.h>
|
||||
|
||||
#include <kdebug.h>
|
||||
#include <klocale.h>
|
||||
|
|
|
|||
|
|
@ -21,8 +21,7 @@
|
|||
#define KROSS_TRANSLATION_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/qvariant.h>
|
||||
|
||||
#include <QVariant>
|
||||
#include <QString>
|
||||
|
||||
class KLocalizedString;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ set(krossui_LIB_SRCS
|
|||
)
|
||||
|
||||
add_library(krossui ${LIBRARY_TYPE} ${krossui_LIB_SRCS})
|
||||
target_link_libraries(krossui
|
||||
target_link_libraries(krossui PUBLIC
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KPARTS_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ include_directories(
|
|||
|
||||
add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kunitconversion
|
||||
target_link_libraries(kunitconversion PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KUNITCONVERSION_EXTRA_LIBS}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@ set(kemoticons_LIB_SRCS
|
|||
|
||||
add_library(kemoticons ${LIBRARY_TYPE} ${kemoticons_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kemoticons ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
|
||||
target_link_libraries(kemoticons PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
)
|
||||
|
||||
set_target_properties(kemoticons PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
|
|
@ -54,11 +58,6 @@ install(
|
|||
|
||||
######## kidletime ####################
|
||||
|
||||
configure_file(
|
||||
kidletime/config-kidletime.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/config-kidletime.h
|
||||
)
|
||||
|
||||
set(kidletime_LIB_SRCS
|
||||
kidletime/kidletime.cpp
|
||||
kidletime/abstractsystempoller.cpp
|
||||
|
|
@ -86,7 +85,7 @@ endif(Q_WS_X11)
|
|||
|
||||
add_library(kidletime ${LIBRARY_TYPE} ${kidletime_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kidletime
|
||||
target_link_libraries(kidletime PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
|
|
@ -94,13 +93,13 @@ target_link_libraries(kidletime
|
|||
|
||||
if (Q_WS_X11)
|
||||
if(HAVE_XSCREENSAVER)
|
||||
target_link_libraries(kidletime ${X11_Xscreensaver_LIB})
|
||||
endif (HAVE_XSCREENSAVER)
|
||||
target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
|
||||
endif()
|
||||
|
||||
if(HAVE_XSYNC)
|
||||
target_link_libraries(kidletime ${X11_Xext_LIB})
|
||||
target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
|
||||
endif()
|
||||
target_link_libraries(kidletime ${X11_LIBRARIES})
|
||||
target_link_libraries(kidletime PRIVATE ${X11_LIBRARIES})
|
||||
endif (Q_WS_X11)
|
||||
|
||||
set_target_properties(kidletime PROPERTIES
|
||||
|
|
@ -142,7 +141,7 @@ set(kcmutils_LIB_SRCS
|
|||
|
||||
add_library(kcmutils ${LIBRARY_TYPE} ${kcmutils_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kcmutils
|
||||
target_link_libraries(kcmutils PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
|
|
@ -187,7 +186,7 @@ install(
|
|||
|
||||
add_library(kprintutils ${LIBRARY_TYPE} kprintpreview.cpp)
|
||||
|
||||
target_link_libraries(kprintutils
|
||||
target_link_libraries(kprintutils PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KPARTS_LIBS}
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
/* config-kidletime.h. Generated by cmake from config-kidletime.h.cmake */
|
||||
|
||||
#cmakedefine HAVE_XTEST 1
|
||||
|
||||
#cmakedefine HAVE_XSCREENSAVER 1
|
||||
|
||||
/* Define if you have the XSync extension */
|
||||
#cmakedefine HAVE_XSYNC 1
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "kidletime.h"
|
||||
|
||||
#include <config-kidletime.h>
|
||||
#include "config.h"
|
||||
|
||||
#ifdef Q_WS_X11
|
||||
#ifdef HAVE_XSCREENSAVER
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#include "xscreensaverbasedpoller.h"
|
||||
|
||||
#include <config-kidletime.h>
|
||||
#include "config.h"
|
||||
|
||||
#include <QtGui/qx11info_x11.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <kdebug.h>
|
||||
#include <kapplication.h>
|
||||
|
||||
#include <config-kidletime.h>
|
||||
#include "config.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/extensions/sync.h>
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ set(kmediaplayer_LIB_SRCS
|
|||
|
||||
add_library(kmediaplayer ${LIBRARY_TYPE} ${kmediaplayer_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kmediaplayer
|
||||
target_link_libraries(kmediaplayer PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
)
|
||||
|
||||
if(MPV_FOUND)
|
||||
target_link_libraries(kmediaplayer ${MPV_LIBRARIES})
|
||||
target_link_libraries(kmediaplayer PRIVATE ${MPV_LIBRARIES})
|
||||
endif()
|
||||
|
||||
set_target_properties(kmediaplayer PROPERTIES
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ kde4_add_kcfg_files(plasma_LIB_SRCS
|
|||
|
||||
add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
|
||||
|
||||
target_link_libraries(plasma
|
||||
target_link_libraries(plasma PUBLIC
|
||||
${QT_QTUITOOLS_LIBRARY}
|
||||
${QT_QTSCRIPT_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
|
|
@ -181,11 +181,11 @@ target_link_libraries(plasma
|
|||
)
|
||||
|
||||
if(X11_FOUND)
|
||||
target_link_libraries(plasma ${X11_LIBRARIES})
|
||||
target_link_libraries(plasma PRIVATE ${X11_LIBRARIES})
|
||||
endif(X11_FOUND)
|
||||
|
||||
if(DL_LIBRARY)
|
||||
target_link_libraries(plasma ${DL_LIBRARY})
|
||||
target_link_libraries(plasma PRIVATE ${DL_LIBRARY})
|
||||
endif(DL_LIBRARY)
|
||||
|
||||
set_target_properties(plasma PROPERTIES
|
||||
|
|
|
|||
|
|
@ -347,13 +347,15 @@ qt4_add_dbus_interface(solid_LIB_SRCS
|
|||
|
||||
add_library(solid ${LIBRARY_TYPE} ${solid_LIB_SRCS})
|
||||
|
||||
target_link_libraries(solid
|
||||
target_link_libraries(solid PRIVATE
|
||||
${solid_OPTIONAL_LIBS}
|
||||
)
|
||||
|
||||
target_link_libraries(solid PUBLIC
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTDBUS_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_CORE_LIBRARY}
|
||||
${solid_OPTIONAL_LIBS}
|
||||
)
|
||||
|
||||
set_target_properties(solid PROPERTIES
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ set(ThreadWeaver_LIB_SRCS
|
|||
|
||||
add_library(threadweaver ${LIBRARY_TYPE} ${ThreadWeaver_LIB_SRCS})
|
||||
|
||||
target_link_libraries(threadweaver ${KDE4_KDECORE_LIBS})
|
||||
target_link_libraries(threadweaver PUBLIC
|
||||
${KDE4_KDECORE_LIBS}
|
||||
)
|
||||
|
||||
set_target_properties(threadweaver PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue