[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/base/konq-plugins/babelfish
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2009-11-29 15:30:11
Message-ID: 1259508611.667537.31110.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056181 by uwolfer:

Build against kdewebkit from kdelibs when building against recent kdelibs.

 M  +30 -24    CMakeLists.txt  
 M  +1 -2      config-babelfish.h.cmake  
 M  +2 -2      plugin_babelfish.cpp  


--- trunk/extragear/base/konq-plugins/babelfish/CMakeLists.txt #1056180:1056181
@@ -1,15 +1,7 @@
+project(babelfish)
 
-
-
 include(MacroOptionalDependPackage)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
-if(DEPEND_PACKAGE_KdeWebKit)
-        macro_optional_find_package(KdeWebKit QUIET)
-else(DEPEND_PACKAGE_KdeWebKit)
-        set(KDEWEBKIT_FOUND FALSE)
-endif(DEPEND_PACKAGE_KdeWebKit)
-
 MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "webkitpart")
 if(DEPEND_PACKAGE_WebKitPart)
         macro_optional_find_package(WebKitPart QUIET)
@@ -17,20 +9,29 @@
         set(WEBKITPART_FOUND FALSE)
 endif(DEPEND_PACKAGE_WebKitPart)
 
-if( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
-    set(WEBKITKDE_FOUND true)
-endif( WEBKITPART_FOUND AND KDEWEBKIT_FOUND)
 
+if(${KDE_VERSION} VERSION_LESS 4.3.74) # newer kdelibs versions include webkitkde
+    MACRO_OPTIONAL_DEPEND_PACKAGE(KdeWebKit "kdewebkit")
+    if(DEPEND_PACKAGE_KdeWebKit)
+            macro_optional_find_package(KdeWebKit QUIET)
+    else(DEPEND_PACKAGE_KdeWebKit)
+            set(WEBKITPART_FOUND FALSE)
+    endif(DEPEND_PACKAGE_KdeWebKit)
+endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
-macro_log_feature(WEBKITKDE_FOUND "WebKitKde" "Webkitkde libraries and header files" \
"" FALSE "" "Webkitkde is necessary to compile support for WebKitKde.")  
-macro_bool_to_01(WEBKITKDE_FOUND HAVE_WEBKITKDE)
+macro_log_feature(WEBKITPART_FOUND "WebKitKde" "Webkitkde libraries and header \
files" "https://svn.kde.org/home/kde/trunk/playground/libs/webkitkde" FALSE "" \
"Webkitkde is necessary to compile Babelfish support for WebKitKde.")  
+macro_bool_to_01(WEBKITPART_FOUND HAVE_WEBKITPART)
 
-if( WEBKITKDE_FOUND )
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
+
+if( WEBKITPART_FOUND )
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        include_directories(kwebkit ${KDEWEBKIT_INCLUDE_DIR})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
+
     include_directories(${WEBKITPART_INCLUDE_DIR})
-endif(WEBKITKDE_FOUND)
+endif(WEBKITPART_FOUND)
 
 
 
@@ -46,11 +47,17 @@
 
 
 target_link_libraries(babelfishplugin  ${KDE4_KHTML_LIBS} )
-if( WEBKITKDE_FOUND)
-    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} \
                ${KDEWEBKIT_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} )
-endif(WEBKITKDE_FOUND)
+if( WEBKITPART_FOUND)
+    if(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDEWEBKIT_LIBRARIES})
+    else(${KDE_VERSION} VERSION_LESS 4.3.74)
+        target_link_libraries(babelfishplugin ${KDE4_KDEWEBKIT_LIBS})
+    endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 
+    target_link_libraries(babelfishplugin ${WEBKITPART_LIBRARIES} \
${QT_QTWEBKIT_LIBRARY}) +endif(WEBKITPART_FOUND)
 
+
 install(TARGETS babelfishplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
@@ -58,8 +65,7 @@
 
 install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  \
${DATA_INSTALL_DIR}/khtml/kpartplugins )  install( FILES translaterc  DESTINATION  \
                ${CONFIG_INSTALL_DIR} )
-if(WEBKITKDE_FOUND)
+if(WEBKITPART_FOUND)
    install( FILES plugin_babelfish.rc plugin_babelfish.desktop  DESTINATION  \
                ${DATA_INSTALL_DIR}/webkitpart/kpartplugins )
-endif(WEBKITKDE_FOUND)
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
-
+endif(WEBKITPART_FOUND)
+kde4_install_icons(${ICON_INSTALL_DIR})
--- trunk/extragear/base/konq-plugins/babelfish/config-babelfish.h.cmake \
#1056180:1056181 @@ -1,2 +1 @@
-#cmakedefine HAVE_WEBKITKDE 1
-#cmakedefine HAVE_WEBVIEW 1
+#cmakedefine HAVE_WEBKITPART 1
--- trunk/extragear/base/konq-plugins/babelfish/plugin_babelfish.cpp #1056180:1056181
@@ -41,7 +41,7 @@
 #include <KConfigGroup>
 #include <KHTMLPart>
 
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
 #include <webkitpart.h>
 #include <QWebView>
 #endif
@@ -246,7 +246,7 @@
   }
   else
   {
-#ifdef HAVE_WEBKITKDE
+#ifdef HAVE_WEBKITPART
       WebKitPart *part = dynamic_cast<WebKitPart *>(parent());
       hasSelection = !part->view()->selectedText().isEmpty();
       selection = part->view()->selectedText();


[prev in list] [next in list] [prev in thread] [next in thread]