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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Michael David Howell <mhowell123 () gmail ! com>
Date:       2008-09-06 22:24:22
Message-ID: 1220739862.338376.11233.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 857908 by michaelhowell:

The CMakeLists.txt files now make use of the CMake modules.



 M  +4 -1      CMakeLists.txt  
 M  +6 -0      kdenetwork/cmake/modules/FindKdeNetwork.cmake  
 M  +5 -6      kdewebkit/CMakeLists.txt  
 M  +6 -0      kdewebkit/cmake/modules/FindKdeWebKit.cmake  
 M  +6 -0      part/cmake/modules/FindWebKitPart.cmake  


--- trunk/playground/libs/webkitkde/CMakeLists.txt #857907:857908
@@ -1,6 +1,9 @@
 project(webkitkde)
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+set(CMAKE_MODULE_PATH
+    ${CMAKE_SOURCE_DIR}/kdewebkit/cmake/modules
+    ${CMAKE_SOURCE_DIR}/kdenetwork/cmake/modules
+    ${CMAKE_SOURCE_DIR}/part/cmake/modules)
 
 add_subdirectory(kdenetwork)
 add_subdirectory(icons)
--- trunk/playground/libs/webkitkde/kdenetwork/cmake/modules/FindKdeNetwork.cmake \
#857907:857908 @@ -15,6 +15,12 @@
    SET(KdeNetwork_FIND_QUIETLY TRUE)
 endif ( KDENETWORK_INCLUDE_DIR AND KDENETWORK_LIBRARIES )
 
+# Little trick I found in FindKDE4Interal... If we're building KdeNetwork, set the \
variables to point to the build directory. +if(kdenetwork_SOURCE_DIR)
+    set(KDENETWORK_LIBRARIES kdenetwork)
+    set(KDENETWORK_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
+endif(kdenetwork_SOURCE_DIR)
+
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 if( NOT WIN32 )
--- trunk/playground/libs/webkitkde/kdewebkit/CMakeLists.txt #857907:857908
@@ -5,16 +5,15 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 
-include_directories(${KDE4_INCLUDES})
+# QtWebKit uses QtNetwork, to KdeWebKit uses....
+find_package(KdeNetwork REQUIRED)
+
+include_directories(${KDE4_INCLUDES} ${KDENETWORK_INCLUDES})
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 add_subdirectory(includes)
 add_subdirectory(cmake)
 
-include_directories( # XXX
-    ${CMAKE_SOURCE_DIR}
-)
-
 set(kdewebkit_LIB_SRCS
     kwebview.cpp
     kwebpage.cpp
@@ -31,7 +30,7 @@
 kde4_add_library(kdewebkit SHARED ${kdewebkit_LIB_SRCS})
 
 target_link_libraries(kdewebkit
-    kdenetwork
+    ${KDENETWORK_LIBRARIES}
     ${KDE4_KPARTS_LIBS}
     ${QT_QTWEBKIT_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
--- trunk/playground/libs/webkitkde/kdewebkit/cmake/modules/FindKdeWebKit.cmake \
#857907:857908 @@ -15,6 +15,12 @@
    SET(KdeWebKit_FIND_QUIETLY TRUE)
 endif ( KDEWEBKIT_INCLUDE_DIR AND KDEWEBKIT_LIBRARIES )
 
+# Little trick I found in FindKDE4Interal... If we're building KdeWebKit, set the \
variables to point to the build directory. +if(kdewebkit_SOURCE_DIR)
+    set(KDEWEBKIT_LIBRARIES kdewebkit)
+    set(KDEWEBKIT_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
+endif(kdewebkit_SOURCE_DIR)
+
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 if( NOT WIN32 )
--- trunk/playground/libs/webkitkde/part/cmake/modules/FindWebKitPart.cmake \
#857907:857908 @@ -15,6 +15,12 @@
    SET(WebKitPart_FIND_QUIETLY TRUE)
 endif ( WEBKITPART_INCLUDE_DIR AND WEBKITPART_LIBRARIES )
 
+# Little trick I found in FindKDE4Interal... If we're building WebKitPart, set the \
variables to point to the build directory. +if(webkitpart_SOURCE_DIR)
+    set(WEBKITPART_LIBRARIES webkitkpart)
+    set(WEBKITPART_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
+endif(webkitpart_SOURCE_DIR)
+
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 if( NOT WIN32 )


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