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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Laurent Montel <montel () kde ! org>
Date:       2008-09-01 19:02:41
Message-ID: 1220295761.528112.17591.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 855939 by mlaurent:

Revert it. Re-create lib.
Otherwise it breaks all konqueror plugins.
And if we install header we must have a lib.
Fix cmake check


 M  +15 -4     CMakeLists.txt  
 M  +11 -1     cmake/modules/FindWebKitKde.cmake  


--- trunk/playground/libs/webkitkde/CMakeLists.txt #855938:855939
@@ -19,15 +19,26 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit/
 )
 
-set(webkitpart_SRCS
+set(webkitkde_LIB_SRCS
     webkitpart.cpp
     webview.cpp
     webpage.cpp
-    webkitpartfactory.cpp
-)
+    )
 
-kde4_add_plugin(webkitkdepart ${webkitpart_SRCS})
+kde4_add_library(webkitkde SHARED ${webkitkde_LIB_SRCS})
 
+target_link_libraries(webkitkde kdewebkit ${KDE4_KPARTS_LIBS} ${QT_QTWEBKIT_LIBRARY})
+
+set_target_properties(webkitkde PROPERTIES VERSION 1.0.0 SOVERSION 1)
+
+install(TARGETS webkitkde ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
+
+kde4_add_plugin(webkitkdepart webkitpartfactory.cpp)
+
+target_link_libraries(webkitkdepart webkitkde)
+
 target_link_libraries(webkitkdepart kdewebkit ${KDE4_KPARTS_LIBS} ${QT_QTWEBKIT_LIBRARY})
 
 install(FILES
--- trunk/playground/libs/webkitkde/cmake/modules/FindWebKitKde.cmake #855938:855939
@@ -32,12 +32,22 @@
   PATH_SUFFIXES webkitkde
 )
 
-FIND_LIBRARY(WEBKITKDE_LIBRARIES NAMES kdewebkit
+FIND_LIBRARY(WEBKITKDE_LIBRARY NAMES webkitkde
   PATHS
   ${_WebKitKdeLinkDir}
   ${KDE4_LIB_INSTALL_DIR}
 )
 
+FIND_LIBRARY(KDEWEBKIT_LIBRARY NAMES kdewebkit
+  PATHS
+  ${_WebKitKdeLinkDir}
+  ${KDE4_LIB_INSTALL_DIR}
+)
+
+if( KDEWEBKIT_LIBRARY AND WEBKITKDE_LIBRARY)
+   set(WEBKITKDE_LIBRARIES ${KDEWEBKIT_LIBRARY} ${WEBKITKDE_LIBRARY})
+endif( KDEWEBKIT_LIBRARY AND WEBKITKDE_LIBRARY)
+
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WebKitKde DEFAULT_MSG WEBKITKDE_INCLUDE_DIR WEBKITKDE_LIBRARIES )
 
[prev in list] [next in list] [prev in thread] [next in thread]