mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
generic: build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
53b39f3865
commit
a7b93fa3b2
14 changed files with 807 additions and 3883 deletions
|
|
@ -153,7 +153,7 @@
|
|||
# Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
|
||||
# relative path to the file.
|
||||
#
|
||||
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
# KDE4_ADD_WIDGET (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
# Use this to add widget description files for the makekdewidgets code generator
|
||||
# for Qt Designer plugins.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# KDE4_ADD_KCFG_FILES
|
||||
# KDE4_ADD_PLUGIN
|
||||
# KDE4_ADD_TEST
|
||||
# KDE4_ADD_WIDGET_FILES
|
||||
# KDE4_ADD_WIDGET
|
||||
# KDE4_INSTALL_ICONS
|
||||
# KDE4_CREATE_MANPAGE
|
||||
# KDE4_INSTALL_AUTH_HELPER_FILES
|
||||
|
|
@ -172,7 +172,7 @@ set(_KDE4_ICON_THEME_hi "hicolor")
|
|||
|
||||
|
||||
# only used internally by KDE4_INSTALL_ICONS
|
||||
macro(_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME _l10n_SUBDIR)
|
||||
macro(_KDE4_ADD_ICON_INSTALL_RULE _install_PATH _group _orig_NAME _install_NAME _l10n_SUBDIR)
|
||||
# if the string doesn't match the pattern, the result is the full string,
|
||||
# so all three have the same content
|
||||
if(NOT ${_group} STREQUAL ${_install_NAME})
|
||||
|
|
@ -180,7 +180,7 @@ macro(_KDE4_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAM
|
|||
if(NOT _icon_GROUP)
|
||||
set(_icon_GROUP "actions")
|
||||
endif()
|
||||
# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}")
|
||||
# message(STATUS "path: ${_install_PATH} group: ${_group} name: ${_install_NAME} l10n: ${_l10n_SUBDIR}")
|
||||
install(
|
||||
FILES ${_orig_NAME}
|
||||
DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/
|
||||
|
|
@ -216,9 +216,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
|
|||
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
|
||||
if( _theme_GROUP)
|
||||
_KDE4_ADD_ICON_INSTALL_RULE(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
|
||||
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
|
||||
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}
|
||||
${_group}
|
||||
${_current_ICON}
|
||||
${_name}
|
||||
${_l10n_SUBDIR}
|
||||
)
|
||||
endif( _theme_GROUP)
|
||||
endforeach(_current_ICON)
|
||||
|
|
@ -238,9 +240,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
|
|||
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
|
||||
if(_theme_GROUP)
|
||||
_KDE4_ADD_ICON_INSTALL_RULE(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
|
||||
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
|
||||
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}
|
||||
${_group}
|
||||
${_current_ICON}
|
||||
${_name}
|
||||
${_l10n_SUBDIR}
|
||||
)
|
||||
endif()
|
||||
endforeach()
|
||||
|
|
@ -259,9 +263,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
|
|||
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
|
||||
if(_theme_GROUP)
|
||||
_KDE4_ADD_ICON_INSTALL_RULE(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
|
||||
${_defaultpath}/${_theme_GROUP}/scalable
|
||||
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR}
|
||||
${_group}
|
||||
${_current_ICON}
|
||||
${_name}
|
||||
${_l10n_SUBDIR}
|
||||
)
|
||||
endif()
|
||||
endforeach()
|
||||
|
|
@ -318,7 +324,7 @@ macro(KDE4_ADD_MANUAL_TEST _targetName)
|
|||
)
|
||||
endmacro(KDE4_ADD_MANUAL_TEST)
|
||||
|
||||
macro(KDE4_ADD_WIDGET_FILES _sources)
|
||||
macro(KDE4_ADD_WIDGET _output _sources)
|
||||
foreach(_current_FILE ${_sources})
|
||||
get_filename_component(_input ${_current_FILE} ABSOLUTE)
|
||||
get_filename_component(_basename ${_input} NAME_WE)
|
||||
|
|
@ -328,7 +334,8 @@ macro(KDE4_ADD_WIDGET_FILES _sources)
|
|||
set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
|
||||
|
||||
# create source file from the .widgets file
|
||||
add_custom_command(OUTPUT ${_source}
|
||||
add_custom_command(
|
||||
OUTPUT ${_source}
|
||||
COMMAND ${KDE4_MAKEKDEWIDGETS_EXECUTABLE} -o ${_source} ${_input}
|
||||
MAIN_DEPENDENCY ${_input}
|
||||
)
|
||||
|
|
@ -336,8 +343,10 @@ macro(KDE4_ADD_WIDGET_FILES _sources)
|
|||
qt4_generate_moc(${_source} ${_moc})
|
||||
|
||||
add_library(${_basename}_autowidgets OBJECT ${_source} ${_moc})
|
||||
|
||||
set(${_output} ${${_output}} ${_source})
|
||||
endforeach(_current_FILE)
|
||||
endmacro(KDE4_ADD_WIDGET_FILES)
|
||||
endmacro(KDE4_ADD_WIDGET)
|
||||
|
||||
|
||||
# This macro adds the needed files for an helper executable meant to be used by
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,15 +10,18 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
|||
set(KBUILDSYCOCA_NO_KCRASH TRUE)
|
||||
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
||||
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kded.h)
|
||||
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/config-kded.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/config-kded.h
|
||||
)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(kded_SRCS
|
||||
kded.cpp
|
||||
kdedadaptor.cpp
|
||||
${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml # just so that it gets generated
|
||||
# just so that it gets generated
|
||||
${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -26,12 +29,13 @@ add_executable(kded4 ${kded_SRCS})
|
|||
|
||||
target_link_libraries(kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
|
||||
|
||||
install(TARGETS kded4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
qt4_generate_dbus_interface( kdedadaptor.h org.kde.kded.xml )
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
|
||||
install(TARGETS kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
qt4_generate_dbus_interface(kdedadaptor.h org.kde.kded.xml)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded.xml
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
|
@ -55,13 +59,24 @@ endif()
|
|||
|
||||
add_executable(kbuildsycoca4 ${kbuildsycoca_SRCS})
|
||||
|
||||
target_link_libraries(kbuildsycoca4 ${KBUILDSYCOCA_MAIN_LIBS} ${QT_QTXML_LIBRARY})
|
||||
target_link_libraries(kbuildsycoca4
|
||||
${KBUILDSYCOCA_MAIN_LIBS}
|
||||
${QT_QTXML_LIBRARY}
|
||||
)
|
||||
|
||||
install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
|
||||
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||
install(
|
||||
FILES applications.menu
|
||||
DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus
|
||||
)
|
||||
|
||||
install(
|
||||
FILES
|
||||
kdedmodule.desktop
|
||||
DESTINATION ${SERVICETYPES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QRegExp>
|
||||
|
||||
struct KSycocaResource
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
|
||||
project(kdesu)
|
||||
|
||||
include_directories( ${KDE4_KPTY_INCLUDES} )
|
||||
include_directories(${KDE4_KPTY_INCLUDES})
|
||||
|
||||
check_function_exists(setpriority HAVE_SETPRIORITY)
|
||||
check_function_exists(getpeereid HAVE_GETPEEREID)
|
||||
|
||||
set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
|
||||
check_type_size("struct ucred" STRUCT_UCRED) #defines HAVE_STRUCT_UCRED (bool) and STRUCT_UCRED (size, unused)
|
||||
set(CMAKE_EXTRA_INCLUDE_FILES) #reset CMAKE_EXTRA_INCLUDE_FILES
|
||||
# defines HAVE_STRUCT_UCRED (bool) and STRUCT_UCRED (size, unused)
|
||||
check_type_size("struct ucred" STRUCT_UCRED)
|
||||
# reset CMAKE_EXTRA_INCLUDE_FILES
|
||||
set(CMAKE_EXTRA_INCLUDE_FILES)
|
||||
|
||||
configure_file(config-kdesu.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdesu.h )
|
||||
configure_file(
|
||||
config-kdesu.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/config-kdesu.h
|
||||
)
|
||||
|
||||
find_package(Sudo)
|
||||
add_feature_info(Sudo SUDO_FOUND "Needed for password caching in kdesu" "http://www.sudo.ws/")
|
||||
set_package_properties(Sudo PROPERTIES
|
||||
DESCRIPTION "Sudo allows a system administrator to delegate authority to give certain users"
|
||||
URL "http://www.sudo.ws/"
|
||||
PURPOSE "Needed for password caching in kdesu"
|
||||
)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
|
@ -26,23 +34,25 @@ set(kdesu_LIB_SRCS
|
|||
stub.cpp
|
||||
)
|
||||
|
||||
|
||||
add_library(kdesu ${LIBRARY_TYPE} ${kdesu_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdesu PRIVATE ${KDE4_KPTY_LIBS} )
|
||||
target_link_libraries(kdesu PUBLIC ${QT_QTCORE_LIBRARY} )
|
||||
target_link_libraries(kdesu PRIVATE ${KDE4_KPTY_LIBS})
|
||||
target_link_libraries(kdesu PUBLIC ${QT_QTCORE_LIBRARY})
|
||||
|
||||
if(SUDO_FOUND)
|
||||
add_definitions(-DKDESU_USE_SUDO_DEFAULT)
|
||||
endif(SUDO_FOUND)
|
||||
endif()
|
||||
|
||||
set_target_properties(kdesu PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
install(TARGETS kdesu EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
install(
|
||||
TARGETS kdesu
|
||||
EXPORT kdelibsLibraryTargets
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
|
@ -50,11 +60,12 @@ set(kdesu_stub_SRCS kdesu_stub.c )
|
|||
|
||||
add_executable(kdesu_stub ${kdesu_stub_SRCS})
|
||||
|
||||
install(TARGETS kdesu_stub DESTINATION ${LIBEXEC_INSTALL_DIR} )
|
||||
install(TARGETS kdesu_stub DESTINATION ${LIBEXEC_INSTALL_DIR})
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
kdesu_export.h
|
||||
client.h
|
||||
process.h
|
||||
|
|
|
|||
|
|
@ -6,33 +6,33 @@ include_directories(
|
|||
${CMAKE_SOURCE_DIR}/kdecore/sonnet
|
||||
${CMAKE_SOURCE_DIR}/kdeui
|
||||
${KDE4_KDECORE_INCLUDES}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/actions
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/colors
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/config
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dialogs
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/findreplace
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fonts
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/icons
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/itemviews
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/jobs
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/kernel
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/notifications
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/paged
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/plotting
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shortcuts
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sonnet
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/util
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/widgets
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/windowmanagement
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/xmlgui
|
||||
actions
|
||||
colors
|
||||
config
|
||||
dialogs
|
||||
findreplace
|
||||
fonts
|
||||
icons
|
||||
itemviews
|
||||
jobs
|
||||
kernel
|
||||
notifications
|
||||
paged
|
||||
plotting
|
||||
shortcuts
|
||||
sonnet
|
||||
util
|
||||
widgets
|
||||
windowmanagement
|
||||
xmlgui
|
||||
${CMAKE_CURRENT_BINARY_DIR}/util
|
||||
${DBUSMENUQT_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/widgets )
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/widgets)
|
||||
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/util/config-kwallet.h.cmake
|
||||
util/config-kwallet.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/util/config-kwallet.h
|
||||
)
|
||||
|
||||
|
|
@ -40,11 +40,10 @@ if (X11_Xkb_FOUND)
|
|||
SET(HAVE_XKB TRUE)
|
||||
endif()
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/util/config-kkeyserver.h.cmake
|
||||
util/config-kkeyserver.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/util/config-kkeyserver.h
|
||||
)
|
||||
|
||||
add_subdirectory( about )
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory( tests )
|
||||
add_subdirectory( sonnet/tests )
|
||||
|
|
@ -148,7 +147,7 @@ set(kdeui_LIB_SRCS
|
|||
itemviews/kwidgetitemdelegate.cpp
|
||||
itemviews/kwidgetitemdelegatepool.cpp
|
||||
# This requires patches which are not yet in Qt. Disabled for now.
|
||||
# itemviews/kreparentingproxymodel.cpp
|
||||
# itemviews/kreparentingproxymodel.cpp
|
||||
itemviews/kselectionproxymodel.cpp
|
||||
jobs/kdialogjobuidelegate.cpp
|
||||
jobs/kabstractwidgetjobtracker.cpp
|
||||
|
|
@ -283,10 +282,6 @@ set(kdeui_LIB_SRCS
|
|||
xmlgui/kxmlguifactory.cpp
|
||||
xmlgui/kxmlguifactory_p.cpp
|
||||
xmlgui/kxmlguiversionhandler.cpp
|
||||
)
|
||||
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
dialogs/kdeprintdialog.cpp
|
||||
notifications/kstatusnotifieritem.cpp
|
||||
notifications/kstatusnotifieritemdbus_p.cpp
|
||||
|
|
@ -294,23 +289,26 @@ set(kdeui_LIB_SRCS
|
|||
)
|
||||
|
||||
|
||||
if (Q_WS_X11)
|
||||
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kkeyserver_x11.cpp
|
||||
if(Q_WS_X11)
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
util/kkeyserver_x11.cpp
|
||||
dialogs/kcupsoptionswidget_p.cpp
|
||||
dialogs/kcupsoptionsjobwidget_p.cpp
|
||||
dialogs/kcupsoptionspageswidget_p.cpp
|
||||
dialogs/kcupsoptionssettingswidget_p.cpp )
|
||||
endif (Q_WS_X11)
|
||||
|
||||
if (Q_WS_X11)
|
||||
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} windowmanagement/kwindowsystem_x11.cpp
|
||||
dialogs/kcupsoptionssettingswidget_p.cpp
|
||||
windowmanagement/kwindowsystem_x11.cpp
|
||||
windowmanagement/kwindowinfo_x11.cpp
|
||||
windowmanagement/netwm.cpp )
|
||||
endif (Q_WS_X11)
|
||||
windowmanagement/netwm.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
if (Q_WS_QWS)
|
||||
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} windowmanagement/kwindowsystem_qws.cpp)
|
||||
endif (Q_WS_QWS)
|
||||
if(Q_WS_QWS)
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
windowmanagement/kwindowsystem_qws.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
if (Q_WS_X11 AND X11_Xkb_FOUND)
|
||||
include_directories (
|
||||
|
|
@ -318,99 +316,127 @@ if (Q_WS_X11 AND X11_Xkb_FOUND)
|
|||
${X11_Xlib_INCLUDE_PATH}
|
||||
${XCB_INCLUDES}
|
||||
)
|
||||
set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kmodifierkeyinfoprovider_x11.cpp)
|
||||
else (Q_WS_X11 AND X11_Xkb_FOUND)
|
||||
set (kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kmodifierkeyinfoprovider_dummy.cpp)
|
||||
endif (Q_WS_X11 AND X11_Xkb_FOUND)
|
||||
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
dialogs/kpassworddialog.ui
|
||||
dialogs/knewpassworddialog.ui
|
||||
dialogs/kshortcutsdialog.ui
|
||||
widgets/kdatetimeedit.ui
|
||||
widgets/kshortcutwidget.ui
|
||||
sonnet/sonnetui.ui
|
||||
sonnet/configui.ui
|
||||
)
|
||||
|
||||
if (Q_WS_X11)
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
dialogs/kcupsoptionspageswidget.ui
|
||||
dialogs/kcupsoptionsjobwidget.ui
|
||||
util/kmodifierkeyinfoprovider_x11.cpp
|
||||
)
|
||||
endif (Q_WS_X11)
|
||||
else()
|
||||
set(kdeui_LIB_SRCS
|
||||
${kdeui_LIB_SRCS}
|
||||
util/kmodifierkeyinfoprovider_dummy.cpp
|
||||
)
|
||||
endif()
|
||||
|
||||
set(kwallet_xml util/org.kde.KWallet.xml)
|
||||
install(FILES ${kwallet_xml} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
install(
|
||||
FILES ${kwallet_xml}
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
qt4_add_dbus_interface( kdeui_LIB_SRCS ${kwallet_xml} kwallet_interface )
|
||||
qt4_add_dbus_interfaces(kdeui_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/jobs/org.kde.JobViewServer.xml )
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${kwallet_xml} kwallet_interface )
|
||||
qt4_add_dbus_interfaces(kdeui_LIB_SRCS jobs/org.kde.JobViewServer.xml )
|
||||
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/jobs/org.kde.JobView.xml jobviewiface )
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/jobs/org.kde.JobViewV2.xml jobviewifacev2 )
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS
|
||||
jobs/org.kde.JobView.xml
|
||||
jobviewiface
|
||||
)
|
||||
|
||||
set(statusnotifierwatcher_xml ${CMAKE_CURRENT_SOURCE_DIR}/notifications/org.kde.StatusNotifierWatcher.xml)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${statusnotifierwatcher_xml} statusnotifierwatcher_interface)
|
||||
set(notifications_xml ${CMAKE_CURRENT_SOURCE_DIR}/notifications/org.freedesktop.Notifications.xml)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${notifications_xml} notifications_interface)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS
|
||||
jobs/org.kde.JobViewV2.xml
|
||||
jobviewifacev2
|
||||
)
|
||||
|
||||
qt4_add_dbus_adaptor(kdeui_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/notifications/org.kde.StatusNotifierItem.xml
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/notifications/kstatusnotifieritemdbus_p.h KStatusNotifierItemDBus)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS
|
||||
notifications/org.kde.StatusNotifierWatcher.xml
|
||||
statusnotifierwatcher_interface
|
||||
)
|
||||
|
||||
set(kglobalaccel_xml ${CMAKE_CURRENT_SOURCE_DIR}/shortcuts/org.kde.KGlobalAccel.xml)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS
|
||||
notifications/org.freedesktop.Notifications.xml
|
||||
notifications_interface
|
||||
)
|
||||
|
||||
qt4_add_dbus_adaptor(kdeui_LIB_SRCS
|
||||
notifications/org.kde.StatusNotifierItem.xml
|
||||
notifications/kstatusnotifieritemdbus_p.h KStatusNotifierItemDBus
|
||||
)
|
||||
|
||||
set(kglobalaccel_xml shortcuts/org.kde.KGlobalAccel.xml)
|
||||
set_source_files_properties(${kglobalaccel_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h")
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_xml} kglobalaccel_interface )
|
||||
install(FILES ${kglobalaccel_xml} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
|
||||
set(kglobalaccel_component_xml ${CMAKE_CURRENT_SOURCE_DIR}/shortcuts/org.kde.kglobalaccel.Component.xml)
|
||||
set(kglobalaccel_component_xml shortcuts/org.kde.kglobalaccel.Component.xml)
|
||||
set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES INCLUDE "kglobalshortcutinfo_p.h")
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_component_xml} kglobalaccel_component_interface )
|
||||
install(FILES ${kglobalaccel_component_xml} DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
|
||||
set(knotify_xml ${CMAKE_CURRENT_SOURCE_DIR}/notifications/org.kde.KNotify.xml)
|
||||
set(knotify_xml notifications/org.kde.KNotify.xml)
|
||||
qt4_add_dbus_interface(kdeui_LIB_SRCS ${knotify_xml} knotify_interface)
|
||||
|
||||
add_library(kdeui ${LIBRARY_TYPE} ${kdeui_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdeui PRIVATE ${KDE4_KDECORE_LIBS} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}
|
||||
${QT_QTXML_LIBRARY} ${KDEUI_EXTRA_LIBS} ${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTSVG_LIBRARY} ${DBUSMENUQT_LIBRARIES})
|
||||
target_link_libraries(kdeui PRIVATE
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${X11_LIBRARIES}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
${KDEUI_EXTRA_LIBS}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${DBUSMENUQT_LIBRARIES}
|
||||
)
|
||||
|
||||
|
||||
target_link_libraries(kdeui PUBLIC
|
||||
kdecore
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTSVG_LIBRARY}
|
||||
)
|
||||
|
||||
if(X11_XTest_FOUND)
|
||||
target_link_libraries(kdeui PRIVATE ${X11_XTest_LIB})
|
||||
endif(X11_XTest_FOUND)
|
||||
endif()
|
||||
|
||||
if(X11_Xcursor_FOUND)
|
||||
target_link_libraries(kdeui PRIVATE ${X11_Xcursor_LIB})
|
||||
endif(X11_Xcursor_FOUND)
|
||||
endif()
|
||||
|
||||
if (X11_Xfixes_FOUND)
|
||||
if(X11_Xfixes_FOUND)
|
||||
target_link_libraries(kdeui PRIVATE ${X11_Xfixes_LIB})
|
||||
endif(X11_Xfixes_FOUND)
|
||||
endif()
|
||||
|
||||
if (X11_Xrender_FOUND)
|
||||
if(X11_Xrender_FOUND)
|
||||
target_link_libraries(kdeui PRIVATE ${X11_Xrender_LIB})
|
||||
endif(X11_Xrender_FOUND)
|
||||
endif()
|
||||
|
||||
if (XCB_FOUND)
|
||||
if(XCB_FOUND)
|
||||
target_link_libraries(kdeui PRIVATE ${XCB_LIBRARIES})
|
||||
endif(XCB_FOUND)
|
||||
|
||||
target_link_libraries(kdeui PUBLIC kdecore ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY})
|
||||
endif()
|
||||
|
||||
set_target_properties(kdeui PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
########### install files ###############
|
||||
|
||||
install( FILES util/fixx11h.h util/kkeyserver_x11.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
|
||||
install(
|
||||
TARGETS kdeui
|
||||
EXPORT kdelibsLibraryTargets
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
install( FILES
|
||||
install(
|
||||
FILES
|
||||
util/fixx11h.h
|
||||
util/kkeyserver_x11.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install(
|
||||
FILES
|
||||
dialogs/aboutkde.png
|
||||
dialogs/kdeprint_nup1.png
|
||||
dialogs/kdeprint_nup2.png
|
||||
|
|
@ -418,13 +444,23 @@ install( FILES
|
|||
dialogs/kdeprint_nupother.png
|
||||
dialogs/ktip-bulb.png
|
||||
dialogs/thumb_frame.png
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdeui/pics )
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdeui/pics
|
||||
)
|
||||
|
||||
install( FILES widgets/kcharselect-data DESTINATION ${DATA_INSTALL_DIR}/kcharselect )
|
||||
install(
|
||||
FILES widgets/kcharselect-data
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kcharselect
|
||||
)
|
||||
|
||||
install( FILES xmlgui/ui_standards.rc DESTINATION ${CONFIG_INSTALL_DIR}/ui )
|
||||
install(
|
||||
FILES
|
||||
xmlgui/ui_standards.rc
|
||||
DESTINATION
|
||||
${CONFIG_INSTALL_DIR}/ui
|
||||
)
|
||||
|
||||
install( FILES
|
||||
install(
|
||||
FILES
|
||||
kdeui_export.h
|
||||
actions/kactioncollection.h
|
||||
actions/kactioncategory.h
|
||||
|
|
@ -485,7 +521,8 @@ install( FILES
|
|||
fonts/kfontutils.h
|
||||
icons/kiconeffect.h
|
||||
icons/kicon.h
|
||||
icons/k3icon_p.h # we install the private header as it is needed by kcm (tokoe)
|
||||
# we install the private header as it is needed by kcm (tokoe)
|
||||
icons/k3icon_p.h
|
||||
icons/kiconloader.h
|
||||
icons/kicontheme.h
|
||||
icons/kiconcache.h
|
||||
|
|
@ -507,7 +544,7 @@ install( FILES
|
|||
itemviews/kcategorydrawer.h
|
||||
itemviews/kmodelindexproxymapper.h
|
||||
itemviews/kwidgetitemdelegate.h
|
||||
# itemviews/kreparentingproxymodel.h
|
||||
# itemviews/kreparentingproxymodel.h
|
||||
itemviews/kselectionproxymodel.h
|
||||
jobs/kdialogjobuidelegate.h
|
||||
jobs/kabstractwidgetjobtracker.h
|
||||
|
|
@ -628,40 +665,95 @@ install( FILES
|
|||
xmlgui/kxmlguiclient.h
|
||||
xmlgui/kxmlguibuilder.h
|
||||
xmlgui/kxmlguifactory.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
|
||||
|
||||
# KDE 5 remove this
|
||||
install(FILES
|
||||
widgets/kratingpainter.h
|
||||
widgets/kratingwidget.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk COMPONENT Devel
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install( FILES
|
||||
# KDE 5 remove this
|
||||
install(
|
||||
FILES
|
||||
widgets/kratingpainter.h
|
||||
widgets/kratingwidget.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install(
|
||||
FILES
|
||||
sonnet/dialog.h
|
||||
sonnet/highlighter.h
|
||||
sonnet/configdialog.h
|
||||
sonnet/configwidget.h
|
||||
sonnet/dictionarycombobox.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet COMPONENT Devel )
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}/sonnet
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
||||
install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} )
|
||||
install(
|
||||
PROGRAMS preparetips
|
||||
DESTINATION ${BIN_INSTALL_DIR}
|
||||
)
|
||||
|
||||
install( FILES colors/40.colors colors/Oxygen.colors colors/Web.colors colors/Royal.colors colors/Rainbow.colors
|
||||
DESTINATION ${CONFIG_INSTALL_DIR}/colors)
|
||||
install(
|
||||
FILES
|
||||
colors/40.colors
|
||||
colors/Oxygen.colors
|
||||
colors/Web.colors
|
||||
colors/Royal.colors
|
||||
colors/Rainbow.colors
|
||||
DESTINATION ${CONFIG_INSTALL_DIR}/colors
|
||||
)
|
||||
|
||||
install( FILES
|
||||
install(
|
||||
FILES
|
||||
jobs/org.kde.JobViewServer.xml
|
||||
jobs/org.kde.JobView.xml
|
||||
jobs/org.kde.JobViewV2.xml
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
notifications/org.kde.StatusNotifierItem.xml
|
||||
notifications/org.kde.StatusNotifierWatcher.xml
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
||||
DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
if (NOT Q_WS_X11)
|
||||
if(NOT Q_WS_X11)
|
||||
# install our copy of the rgb.txt named colors list on systems without X11
|
||||
install(FILES colors/rgb.txt DESTINATION ${DATA_INSTALL_DIR}/kdeui)
|
||||
endif (NOT Q_WS_X11)
|
||||
install(
|
||||
FILES
|
||||
colors/rgb.txt
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdeui
|
||||
)
|
||||
endif()
|
||||
|
||||
install(
|
||||
FILES
|
||||
body-background.png
|
||||
bar-bottom-left.png
|
||||
bar-top-right.png
|
||||
bar-bottom-middle.png
|
||||
# bottom-left.png
|
||||
box-middle-left.png
|
||||
# top-right.png
|
||||
bar-bottom-right.png
|
||||
# bottom-middle.png
|
||||
box-middle-right.png
|
||||
top-middle.png
|
||||
bar-middle-left.png
|
||||
# bottom-right.png
|
||||
box-top-left.png
|
||||
bar-middle-right.png
|
||||
box-bottom-left.png
|
||||
box-top-middle.png
|
||||
bar-top-left.png
|
||||
box-bottom-middle.png
|
||||
box-top-right.png
|
||||
bar-top-middle.png
|
||||
box-bottom-right.png
|
||||
box-center.png
|
||||
kde_infopage.css
|
||||
kde_infopage_rtl.css
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdeui/about
|
||||
)
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
install(FILES
|
||||
body-background.png
|
||||
bar-bottom-left.png
|
||||
bar-top-right.png
|
||||
bar-bottom-middle.png
|
||||
# bottom-left.png
|
||||
box-middle-left.png
|
||||
# top-right.png
|
||||
bar-bottom-right.png
|
||||
# bottom-middle.png
|
||||
box-middle-right.png
|
||||
top-middle.png
|
||||
bar-middle-left.png
|
||||
# bottom-right.png
|
||||
box-top-left.png
|
||||
bar-middle-right.png
|
||||
box-bottom-left.png
|
||||
box-top-middle.png
|
||||
bar-top-left.png
|
||||
box-bottom-middle.png
|
||||
box-top-right.png
|
||||
bar-top-middle.png
|
||||
box-bottom-right.png
|
||||
box-center.png
|
||||
kde_infopage.css
|
||||
kde_infopage_rtl.css
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdeui/about)
|
||||
|
|
@ -22,22 +22,41 @@ set(kdewebkit_LIB_SRCS
|
|||
kwebpluginfactory.cpp
|
||||
)
|
||||
|
||||
add_library(kdewebkit ${LIBRARY_TYPE}
|
||||
${kdewebkit_LIB_SRCS}
|
||||
add_library(kdewebkit ${LIBRARY_TYPE} ${kdewebkit_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kdewebkit PRIVATE
|
||||
${KDE4_KPARTS_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
)
|
||||
target_link_libraries(kdewebkit PUBLIC
|
||||
kparts
|
||||
kio
|
||||
kdecore
|
||||
${QT_QTWEBKIT_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
)
|
||||
|
||||
target_link_libraries(kdewebkit PRIVATE ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||||
target_link_libraries(kdewebkit PUBLIC kparts kio kdecore ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
|
||||
set_target_properties(kdewebkit PROPERTIES
|
||||
VERSION ${GENERIC_LIB_VERSION}
|
||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||
)
|
||||
|
||||
set_target_properties(kdewebkit PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
|
||||
install(
|
||||
TARGETS kdewebkit
|
||||
EXPORT kdelibsLibraryTargets
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
||||
install(FILES
|
||||
install(
|
||||
FILES
|
||||
kdewebkit_export.h
|
||||
kwebwallet.h
|
||||
kgraphicswebview.h
|
||||
kwebpluginfactory.h
|
||||
kwebpage.h
|
||||
kwebview.h
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
|
||||
DESTINATION ${INCLUDE_INSTALL_DIR}
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ include_directories(
|
|||
${CMAKE_SOURCE_DIR}/kutils
|
||||
${CMAKE_BINARY_DIR}
|
||||
)
|
||||
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
|
||||
|
||||
set(kwebkit_LIB_SRCS
|
||||
kwebkitpart.cpp
|
||||
|
|
@ -27,15 +26,29 @@ set(kwebkit_LIB_SRCS
|
|||
)
|
||||
|
||||
########################### kwebkitpart #############################
|
||||
|
||||
kde4_add_plugin(kwebkitpart ${kwebkit_LIB_SRCS})
|
||||
|
||||
target_link_libraries(kwebkitpart ${KDE4_KPARTS_LIBS} kdewebkit ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
|
||||
target_link_libraries(kwebkitpart
|
||||
${KDE4_KPARTS_LIBS}
|
||||
${KDE4_KDEWEBKIT_LIBS}
|
||||
${QT_QTWEBKIT_LIBRARY}
|
||||
${QT_QTUITOOLS_LIBRARY}
|
||||
)
|
||||
|
||||
########################### kwebkitpart #############################
|
||||
|
||||
install(TARGETS kwebkitpart DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
||||
install(FILES kwebkitpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
install(
|
||||
FILES
|
||||
kwebkitpart.desktop
|
||||
DESTINATION ${SERVICES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
install(FILES kwebkitpart.rc DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart)
|
||||
|
||||
install(FILES error.html DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart)
|
||||
install(
|
||||
FILES
|
||||
error.html
|
||||
kwebkitpart.rc
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,28 +8,26 @@ add_subdirectory(pics)
|
|||
|
||||
include_directories(${KDE4_KIO_INCLUDES})
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
add_executable(makekdewidgets ${makekdewidgets_SRCS})
|
||||
add_executable(makekdewidgets makekdewidgets.cpp)
|
||||
|
||||
target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS})
|
||||
|
||||
# "export" this target too so we can use the LOCATION property of the imported target in
|
||||
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
||||
install(TARGETS makekdewidgets EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(
|
||||
TARGETS makekdewidgets
|
||||
EXPORT kdelibsToolsTargets
|
||||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
if(QT_QTDESIGNER_FOUND)
|
||||
KDE4_ADD_WIDGET_FILES(kde.widgets)
|
||||
kde4_add_widget(kdewidgets_PART_SRCS kde.widgets)
|
||||
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
$<TARGET_OBJECTS:kde_autowidgets>
|
||||
)
|
||||
|
||||
qt4_add_resources(kdewidgets_PART_SRCS kdewidgets.qrc)
|
||||
|
|
@ -38,30 +36,28 @@ if(QT_QTDESIGNER_FOUND)
|
|||
|
||||
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS})
|
||||
|
||||
install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||
|
||||
# kdewebkit widgets
|
||||
include_directories(${CMAKE_SOURCE_DIR}/kdewebkit)
|
||||
|
||||
KDE4_ADD_WIDGET_FILES(kdewebkit.widgets)
|
||||
kde4_add_widget(kdewebkitwidgets_PART_SRCS kdewebkit.widgets)
|
||||
|
||||
set(kdewebkitwidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
$<TARGET_OBJECTS:kdewebkit_autowidgets>
|
||||
)
|
||||
|
||||
qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
|
||||
|
||||
kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
|
||||
|
||||
target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||||
|
||||
install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
|
||||
endif (QT_QTDESIGNER_FOUND)
|
||||
|
||||
########### install files ###############
|
||||
|
||||
|
||||
|
||||
target_link_libraries(kdewebkitwidgets
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KDEWEBKIT_LIBS}
|
||||
${QT_QTWEBKIT_LIBRARY}
|
||||
)
|
||||
|
||||
install(
|
||||
TARGETS kdewidgets kdewebkitwidgets
|
||||
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
|
||||
)
|
||||
endif(QT_QTDESIGNER_FOUND)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@
|
|||
PROJECT(libkexiv2)
|
||||
|
||||
ADD_DEFINITIONS(
|
||||
${QT_DEFINITIONS}
|
||||
${QT_QTDBUS_DEFINITIONS}
|
||||
${KDE4_DEFINITIONS}
|
||||
-DKDE_DEFAULT_DEBUG_AREA=51003
|
||||
)
|
||||
INCLUDE_DIRECTORIES(
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue