Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42: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 2015-11-01 15:08:31 +02:00
parent 53b39f3865
commit a7b93fa3b2
14 changed files with 807 additions and 3883 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/modules/FindKDE4Internal.cmake
View file

@ -153,7 +153,7 @@
# Use optional USE_RELATIVE_PATH to generate the classes in the build following the given # Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
# relative path to the file. # 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 # Use this to add widget description files for the makekdewidgets code generator
# for Qt Designer plugins. # for Qt Designer plugins.
# #

33
cmake/modules/KDE4Macros.cmake
View file

@ -4,7 +4,7 @@
# KDE4_ADD_KCFG_FILES # KDE4_ADD_KCFG_FILES
# KDE4_ADD_PLUGIN # KDE4_ADD_PLUGIN
# KDE4_ADD_TEST # KDE4_ADD_TEST
# KDE4_ADD_WIDGET_FILES # KDE4_ADD_WIDGET
# KDE4_INSTALL_ICONS # KDE4_INSTALL_ICONS
# KDE4_CREATE_MANPAGE # KDE4_CREATE_MANPAGE
# KDE4_INSTALL_AUTH_HELPER_FILES # KDE4_INSTALL_AUTH_HELPER_FILES
@ -172,7 +172,7 @@ set(_KDE4_ICON_THEME_hi "hicolor")
# only used internally by KDE4_INSTALL_ICONS # 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, # if the string doesn't match the pattern, the result is the full string,
# so all three have the same content # so all three have the same content
if(NOT ${_group} STREQUAL ${_install_NAME}) 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) if(NOT _icon_GROUP)
set(_icon_GROUP "actions") set(_icon_GROUP "actions")
endif() 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( install(
FILES ${_orig_NAME} FILES ${_orig_NAME}
DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/ DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/
@ -216,9 +216,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}}) set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
if( _theme_GROUP) if( _theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE( _KDE4_ADD_ICON_INSTALL_RULE(
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size} ${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR} ${_group}
${_current_ICON}
${_name}
${_l10n_SUBDIR}
) )
endif( _theme_GROUP) endif( _theme_GROUP)
endforeach(_current_ICON) endforeach(_current_ICON)
@ -238,9 +240,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}}) set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
if(_theme_GROUP) if(_theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE( _KDE4_ADD_ICON_INSTALL_RULE(
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size} ${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR} ${_group}
${_current_ICON}
${_name}
${_l10n_SUBDIR}
) )
endif() endif()
endforeach() endforeach()
@ -259,9 +263,11 @@ macro(KDE4_INSTALL_ICONS _defaultpath )
set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}}) set(_theme_GROUP ${_KDE4_ICON_THEME_${_type}})
if(_theme_GROUP) if(_theme_GROUP)
_KDE4_ADD_ICON_INSTALL_RULE( _KDE4_ADD_ICON_INSTALL_RULE(
${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/scalable ${_defaultpath}/${_theme_GROUP}/scalable
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR} ${_group}
${_current_ICON}
${_name}
${_l10n_SUBDIR}
) )
endif() endif()
endforeach() endforeach()
@ -318,7 +324,7 @@ macro(KDE4_ADD_MANUAL_TEST _targetName)
) )
endmacro(KDE4_ADD_MANUAL_TEST) endmacro(KDE4_ADD_MANUAL_TEST)
macro(KDE4_ADD_WIDGET_FILES _sources) macro(KDE4_ADD_WIDGET _output _sources)
foreach(_current_FILE ${_sources}) foreach(_current_FILE ${_sources})
get_filename_component(_input ${_current_FILE} ABSOLUTE) get_filename_component(_input ${_current_FILE} ABSOLUTE)
get_filename_component(_basename ${_input} NAME_WE) 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) set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
# create source file from the .widgets file # create source file from the .widgets file
add_custom_command(OUTPUT ${_source} add_custom_command(
OUTPUT ${_source}
COMMAND ${KDE4_MAKEKDEWIDGETS_EXECUTABLE} -o ${_source} ${_input} COMMAND ${KDE4_MAKEKDEWIDGETS_EXECUTABLE} -o ${_source} ${_input}
MAIN_DEPENDENCY ${_input} MAIN_DEPENDENCY ${_input}
) )
@ -336,8 +343,10 @@ macro(KDE4_ADD_WIDGET_FILES _sources)
qt4_generate_moc(${_source} ${_moc}) qt4_generate_moc(${_source} ${_moc})
add_library(${_basename}_autowidgets OBJECT ${_source} ${_moc}) add_library(${_basename}_autowidgets OBJECT ${_source} ${_moc})
set(${_output} ${${_output}} ${_source})
endforeach(_current_FILE) 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 # This macro adds the needed files for an helper executable meant to be used by

1067
kdcraw/libkdcraw/Doxyfile
View file

File diff suppressed because it is too large Load diff

39
kded/CMakeLists.txt
View file

@ -10,15 +10,18 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(KBUILDSYCOCA_NO_KCRASH TRUE) set(KBUILDSYCOCA_NO_KCRASH TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) 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 ############### ########### next target ###############
set(kded_SRCS set(kded_SRCS
kded.cpp kded.cpp
kdedadaptor.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}) target_link_libraries(kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
install(TARGETS kded4 ${INSTALL_TARGETS_DEFAULT_ARGS} ) 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})
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 ############### ########### next target ###############
@ -55,13 +59,24 @@ endif()
add_executable(kbuildsycoca4 ${kbuildsycoca_SRCS}) 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 ###############
install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) install(
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) FILES applications.menu
DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus
)
install(
FILES
kdedmodule.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)

1
kded/ksycocaresourcelist.h
View file

@ -20,7 +20,6 @@
#include <QtCore/QLinkedList> #include <QtCore/QLinkedList>
#include <QtCore/QString> #include <QtCore/QString>
#include <QtCore/QRegExp>
struct KSycocaResource struct KSycocaResource
{ {

39
kdesu/CMakeLists.txt
View file

@ -1,19 +1,27 @@
project(kdesu) project(kdesu)
include_directories( ${KDE4_KPTY_INCLUDES} ) include_directories(${KDE4_KPTY_INCLUDES})
check_function_exists(setpriority HAVE_SETPRIORITY) check_function_exists(setpriority HAVE_SETPRIORITY)
check_function_exists(getpeereid HAVE_GETPEEREID) check_function_exists(getpeereid HAVE_GETPEEREID)
set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h) 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) # defines HAVE_STRUCT_UCRED (bool) and STRUCT_UCRED (size, unused)
set(CMAKE_EXTRA_INCLUDE_FILES) #reset CMAKE_EXTRA_INCLUDE_FILES 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) 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 ############### ########### next target ###############
@ -26,23 +34,25 @@ set(kdesu_LIB_SRCS
stub.cpp stub.cpp
) )
add_library(kdesu ${LIBRARY_TYPE} ${kdesu_LIB_SRCS}) add_library(kdesu ${LIBRARY_TYPE} ${kdesu_LIB_SRCS})
target_link_libraries(kdesu PRIVATE ${KDE4_KPTY_LIBS} ) target_link_libraries(kdesu PRIVATE ${KDE4_KPTY_LIBS})
target_link_libraries(kdesu PUBLIC ${QT_QTCORE_LIBRARY} ) target_link_libraries(kdesu PUBLIC ${QT_QTCORE_LIBRARY})
if(SUDO_FOUND) if(SUDO_FOUND)
add_definitions(-DKDESU_USE_SUDO_DEFAULT) add_definitions(-DKDESU_USE_SUDO_DEFAULT)
endif(SUDO_FOUND) endif()
set_target_properties(kdesu PROPERTIES set_target_properties(kdesu PROPERTIES
VERSION ${GENERIC_LIB_VERSION} VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION} SOVERSION ${GENERIC_LIB_SOVERSION}
) )
install(TARGETS kdesu EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(
TARGETS kdesu
EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
########### next target ############### ########### next target ###############
@ -50,11 +60,12 @@ set(kdesu_stub_SRCS kdesu_stub.c )
add_executable(kdesu_stub ${kdesu_stub_SRCS}) 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 install(
FILES
kdesu_export.h kdesu_export.h
client.h client.h
process.h process.h

1238
kdeui/CMakeLists.txt
View file

File diff suppressed because it is too large Load diff

27
kdeui/about/CMakeLists.txt
View file

@ -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)

43
kdewebkit/CMakeLists.txt
View file

@ -9,9 +9,9 @@ if(NOT QT_QTWEBKIT_FOUND)
endif() endif()
include_directories( include_directories(
${KDE4_KDECORE_INCLUDES} ${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES} ${KDE4_KDEUI_INCLUDES}
${KDE4_KIO_INCLUDES} ${KDE4_KIO_INCLUDES}
) )
set(kdewebkit_LIB_SRCS set(kdewebkit_LIB_SRCS
@ -22,22 +22,41 @@ set(kdewebkit_LIB_SRCS
kwebpluginfactory.cpp kwebpluginfactory.cpp
) )
add_library(kdewebkit ${LIBRARY_TYPE} add_library(kdewebkit ${LIBRARY_TYPE} ${kdewebkit_LIB_SRCS})
${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}) set_target_properties(kdewebkit PROPERTIES
target_link_libraries(kdewebkit PUBLIC kparts kio kdecore ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) 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 kdewebkit_export.h
kwebwallet.h kwebwallet.h
kgraphicswebview.h kgraphicswebview.h
kwebpluginfactory.h kwebpluginfactory.h
kwebpage.h kwebpage.h
kwebview.h kwebview.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) DESTINATION ${INCLUDE_INSTALL_DIR}
COMPONENT Devel
)

25
kdewebkit/kwebkitpart/src/CMakeLists.txt
View file

@ -7,7 +7,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/kutils
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
) )
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
set(kwebkit_LIB_SRCS set(kwebkit_LIB_SRCS
kwebkitpart.cpp kwebkitpart.cpp
@ -27,15 +26,29 @@ set(kwebkit_LIB_SRCS
) )
########################### kwebkitpart ############################# ########################### kwebkitpart #############################
kde4_add_plugin(kwebkitpart ${kwebkit_LIB_SRCS}) 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 ############################# ########################### kwebkitpart #############################
install(TARGETS kwebkitpart DESTINATION ${PLUGIN_INSTALL_DIR}) 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
install(FILES error.html DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart) error.html
kwebkitpart.rc
DESTINATION ${DATA_INSTALL_DIR}/kwebkitpart
)

40
kdewidgets/CMakeLists.txt
View file

@ -8,28 +8,26 @@ add_subdirectory(pics)
include_directories(${KDE4_KIO_INCLUDES}) include_directories(${KDE4_KIO_INCLUDES})
########### next target ############### ########### next target ###############
set(makekdewidgets_SRCS makekdewidgets.cpp ) add_executable(makekdewidgets makekdewidgets.cpp)
add_executable(makekdewidgets ${makekdewidgets_SRCS})
target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS}) target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS})
# "export" this target too so we can use the LOCATION property of the imported target in install(
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex TARGETS makekdewidgets
install(TARGETS makekdewidgets EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) EXPORT kdelibsToolsTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
########### next target ############### ########### next target ###############
if(QT_QTDESIGNER_FOUND) if(QT_QTDESIGNER_FOUND)
KDE4_ADD_WIDGET_FILES(kde.widgets) kde4_add_widget(kdewidgets_PART_SRCS kde.widgets)
set(kdewidgets_PART_SRCS set(kdewidgets_PART_SRCS
classpreviews.cpp classpreviews.cpp
$<TARGET_OBJECTS:kde_autowidgets>
) )
qt4_add_resources(kdewidgets_PART_SRCS kdewidgets.qrc) qt4_add_resources(kdewidgets_PART_SRCS kdewidgets.qrc)
@ -38,30 +36,28 @@ if(QT_QTDESIGNER_FOUND)
target_link_libraries(kdewidgets ${KDE4_KIO_LIBS}) target_link_libraries(kdewidgets ${KDE4_KIO_LIBS})
install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
# kdewebkit widgets # kdewebkit widgets
include_directories(${CMAKE_SOURCE_DIR}/kdewebkit) include_directories(${CMAKE_SOURCE_DIR}/kdewebkit)
KDE4_ADD_WIDGET_FILES(kdewebkit.widgets) kde4_add_widget(kdewebkitwidgets_PART_SRCS kdewebkit.widgets)
set(kdewebkitwidgets_PART_SRCS set(kdewebkitwidgets_PART_SRCS
classpreviews.cpp classpreviews.cpp
$<TARGET_OBJECTS:kdewebkit_autowidgets>
) )
qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc) qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS}) kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY}) target_link_libraries(kdewebkitwidgets
${KDE4_KDEUI_LIBS}
install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer) ${KDE4_KDEWEBKIT_LIBS}
endif (QT_QTDESIGNER_FOUND) ${QT_QTWEBKIT_LIBRARY}
)
########### install files ###############
install(
TARGETS kdewidgets kdewebkitwidgets
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
)
endif(QT_QTDESIGNER_FOUND)

2
kexiv2/CMakeLists.txt
View file

@ -25,9 +25,7 @@
PROJECT(libkexiv2) PROJECT(libkexiv2)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS}
${QT_QTDBUS_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS}
${KDE4_DEFINITIONS}
-DKDE_DEFAULT_DEBUG_AREA=51003 -DKDE_DEFAULT_DEBUG_AREA=51003
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(

1067
kexiv2/libkexiv2/Doxyfile
View file

File diff suppressed because it is too large Load diff

1067
kexiv2/libkexiv2/Doxyfile-developer
View file

File diff suppressed because it is too large Load diff