[WebKit-devel] KDE/kdelibs

[Urs Wolfer]

SVN commit 1046374 by uwolfer:

Move kdewebkit from kdereview to kdelibs.

CCMAIL:webkit-devel at kde.org

 M  +1 -0      CMakeLists.txt  
 M  +5 -2      cmake/modules/FindKDE4Internal.cmake  
 M  +4 -0      includes/CMakeLists.txt  
 A             includes/KGraphicsWebView   trunk/kdereview/kdewebkit/includes/KGraphicsWebView#1046372
 A             includes/KWebPage   trunk/kdereview/kdewebkit/includes/KWebPage#1046372
 A             includes/KWebPluginFactory   trunk/kdereview/kdewebkit/includes/KWebPluginFactory#1046372
 A             includes/KWebView   trunk/kdereview/kdewebkit/includes/KWebView#1046372
 A             kdewebkit (directory)   trunk/kdereview/kdewebkit#1046372
 M  +7 -13     kdewebkit/CMakeLists.txt  
 D             kdewebkit/cmake (directory)  
 D             kdewebkit/includes (directory)  


--- trunk/KDE/kdelibs/CMakeLists.txt #1046373:1046374
@@ -265,6 +265,7 @@
 add_subdirectory( security )
 add_subdirectory( plasma )
 add_subdirectory( kunitconversion )
+add_subdirectory( kdewebkit )
 add_subdirectory( includes )
 
 macro_optional_add_subdirectory( doc  )
--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #1046373:1046374
@@ -41,9 +41,10 @@
 #  KDE4_KNOTIFYCONFIG_LIBRARY- the knotifyconfig library
 #  KDE4_KROSSCORE_LIBRARY   - the krosscore library
 #  KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library
-#  KDE4_NEPOMUK_LIBRARY    - the nepomuk library
+#  KDE4_NEPOMUK_LIBRARY     - the nepomuk library
 #  KDE4_PLASMA_LIBRARY      - the plasma library
 #  KDE4_KUNITCONVERSION_LIBRARY - the kunitconversion library
+#  KDE4_KDEWEBKIT_LIBRARY   - the kdewebkit library
 #
 #  KDE4_PLASMA_OPENGL_FOUND  - TRUE if the OpenGL support of Plasma has been found, NOTFOUND otherwise
 #
@@ -72,9 +73,10 @@
 #  KDE4_KROSSCORE_LIBS        - the kross core library and all depending libraries
 #  KDE4_KROSSUI_LIBS          - the kross ui library which includes core and all depending libraries
 #  KDE4_KTEXTEDITOR_LIBS      - the ktexteditor library and all depending libraries
-#  KDE4_NEPOMUK_LIBS         - the nepomuk library and all depending libraries
+#  KDE4_NEPOMUK_LIBS          - the nepomuk library and all depending libraries
 #  KDE4_PLASMA_LIBS           - the plasma library and all depending librairies
 #  KDE4_KUNITCONVERSION_LIBS  - the kunitconversion library and all depending libraries
+#  KDE4_KDEWEBKIT_LIBS        - the kdewebkit library and all depending libraries
 #
 # This module defines a bunch of variables used as locations for install directories.
 # They can be relative (to CMAKE_INSTALL_PREFIX) or absolute.
@@ -505,6 +507,7 @@
    _kde4_set_lib_variables(KDE3SUPPORT   kde3support   ${KDE4_TARGET_PREFIX})
    _kde4_set_lib_variables(KDECORE       kdecore       ${KDE4_TARGET_PREFIX})
    _kde4_set_lib_variables(KDEUI         kdeui         ${KDE4_TARGET_PREFIX})
+   _kde4_set_lib_variables(KDEWEBKIT     kdewebkit     ${KDE4_TARGET_PREFIX})
    _kde4_set_lib_variables(KDNSSD        kdnssd        ${KDE4_TARGET_PREFIX})
    _kde4_set_lib_variables(KFILE         kfile         ${KDE4_TARGET_PREFIX})
    _kde4_set_lib_variables(KHTML         khtml         ${KDE4_TARGET_PREFIX})
--- trunk/KDE/kdelibs/includes/CMakeLists.txt #1046373:1046374
@@ -458,6 +458,10 @@
   KWidgetItemDelegate
   KPixmapSequence
   KPixmapSequenceOverlayPainter
+  KGraphicsWebView
+  KWebPage
+  KWebView
+  KWebPluginFactory
 DESTINATION ${INCLUDE_INSTALL_DIR}/KDE COMPONENT Devel)
 
 if (UNIX)
--- trunk/KDE/kdelibs/kdewebkit/CMakeLists.txt #1046372:1046374
@@ -1,16 +1,11 @@
 project(kdewebkit)
 
-# search packages used by KDE
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
+include_directories(
+ ${KDE4_KDECORE_INCLUDES}
+ ${KDE4_KDEUI_INCLUDES}
+ ${KDE4_KIO_INCLUDES}
+)
 
-include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit)
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
-add_subdirectory(includes)
-add_subdirectory(cmake)
-
 set(kdewebkit_LIB_SRCS
     kgraphicswebview.cpp
     kwebpage.cpp
@@ -28,8 +23,7 @@
 
 set_target_properties(kdewebkit PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION})
 
-#install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) ### for kdelibs
-install(TARGETS kdewebkit ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
     kdewebkit_export.h
@@ -37,4 +31,4 @@
     kwebpluginfactory.h
     kwebpage.h
     kwebview.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kdewebkit COMPONENT Devel)
+    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)