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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-01-27 0:12:39
Message-ID: 1264551159.205724.7727.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1080813 by adawit:

Make it possible to compile webkit part against KDE 4.3.x

 M  +1 -1      kdelauncher/CMakeLists.txt  
 M  +6 -16     part/CMakeLists.txt  


--- trunk/playground/libs/webkitkde/kdelauncher/CMakeLists.txt #1080812:1080813
@@ -4,7 +4,7 @@
 include(KDE4Defaults)
 
 include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/kdenetwork \
                ${CMAKE_CURRENT_SOURCE_DIR}/../kdewebkit)
-link_directories(${KDE4_LIB_DIR} ${CMAKE_SOURCE_DIR}/kdenetwork \
${CMAKE_CURRENT_SOURCE_DIR}/../kdewebkit) +link_directories(${KDE4_LIB_DIR} \
${CMAKE_SOURCE_DIR}/kdenetwork ${CMAKE_CURRENT_BINARY_DIR}/../kdewebkit)  \
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})  
 #qt4_add_resources( kdelauncher_SRCS kdelauncher.qrc )
--- trunk/playground/libs/webkitkde/part/CMakeLists.txt #1080812:1080813
@@ -5,14 +5,7 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 
-if(${KDE_VERSION} VERSION_LESS 4.3.74)
-    find_package(KdeWebKit REQUIRED)
-endif(${KDE_VERSION} VERSION_LESS 4.3.74)
-
 include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/..)
-if(${KDE_VERSION} VERSION_LESS 4.3.74)
-    include_directories(${KDEWEBKIT_INCLUDE_DIR})
-endif(${KDE_VERSION} VERSION_LESS 4.3.74)
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 add_subdirectory(cmake)
@@ -39,28 +32,25 @@
 )
 
 ########################### kwebkit #############################
-
 kde4_add_library(kwebkit SHARED ${kwebkit_LIB_SRCS})
 
-if(${KDE_VERSION} VERSION_LESS 4.3.74)
-    target_link_libraries(kwebkit ${KDE4_KPARTS_LIBS} ${KDEWEBKIT_LIBRARIES} \
                ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
-else(${KDE_VERSION} VERSION_LESS 4.3.74)
+if(${KDE_VERSION} VERSION_LESS 4.3.80)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../kdewebkit)
+    link_directories(${CMAKE_CURRENT_BINARY_DIR}/../kdewebkit)
+    target_link_libraries(kwebkit kdewebkit ${KDE4_KPARTS_LIBS} \
${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY}) +else(${KDE_VERSION} VERSION_LESS \
                4.3.80)
     target_link_libraries(kwebkit ${KDE4_KPARTS_LIBS} ${KDE4_KDEWEBKIT_LIBS} \
                ${QT_QTWEBKIT_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
-endif(${KDE_VERSION} VERSION_LESS 4.3.74)
+endif(${KDE_VERSION} VERSION_LESS 4.3.80)
 
 set_target_properties(kwebkit PROPERTIES VERSION 1.0.0 SOVERSION 1)
-
 ########################### kwebkit #############################
 
-
 ########################### kwebkitpart #############################
-
 kde4_add_plugin(kwebkitpart kwebkitpartfactory.cpp)
 
 target_link_libraries(kwebkitpart ${KDE4_KPARTS_LIBS} ${QT_QTWEBKIT_LIBRARY} \
kwebkit)  
 set_target_properties(kwebkitpart PROPERTIES VERSION 1.0.0 SOVERSION 1)
-
 ########################### kwebkitpart #############################
 
 install(FILES


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