2011-02-06 Patrick Gansterer <paroga@webkit.org>
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 6 Feb 2011 17:47:14 +0000 (17:47 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 6 Feb 2011 17:47:14 +0000 (17:47 +0000)
        Reviewed by Andreas Kling.

        [CMake] Add dependencies for Visual Studio projects
        https://bugs.webkit.org/show_bug.cgi?id=53773

        Add a JavaScriptCore dependecy to WebCore, so CMake can
        generate the correct build order for the solution.

        * CMakeLists.txt:
2011-02-06  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Add dependencies for Visual Studio projects
        https://bugs.webkit.org/show_bug.cgi?id=53773

        Add a WebCore dependecy to WebKit, so CMake can
        generate the correct build order for the solution.

        Remove JavaScriptCore dependecy, since WebCore already depends on it.

        * CMakeLists.txt:
2011-02-06  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Andreas Kling.

        [CMake] Add dependencies for Visual Studio projects
        https://bugs.webkit.org/show_bug.cgi?id=53773

        Add a WebKit dependecy to WinCELauncher, so CMake can
        generate the correct build order for the solution.

        * CMakeListsWinCE.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@77771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Tools/CMakeListsWinCE.txt
Tools/ChangeLog

index e3097f71f728e2e37cede4ae637845700c1d26f9..e7fb4c9211d8a41b15e1b9a25886cc57a2e416b2 100644 (file)
@@ -2250,6 +2250,7 @@ WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
 ADD_DEFINITIONS(-DBUILDING_WebCore)
 INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
 ADD_DEFINITIONS(-DBUILDING_WebCore)
 INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
+ADD_DEPENDENCIES(${WebCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_NAME})
 TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
 
 IF (WebCore_LINK_FLAGS)
 TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
 
 IF (WebCore_LINK_FLAGS)
index 806e46d35f62d6180e64a605fbf431783569833c..95c8c4ee3752583683862ad0c1c30b9bd6e33ef0 100644 (file)
@@ -1,3 +1,15 @@
+2011-02-06  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Add dependencies for Visual Studio projects
+        https://bugs.webkit.org/show_bug.cgi?id=53773
+
+        Add a JavaScriptCore dependecy to WebCore, so CMake can 
+        generate the correct build order for the solution.
+
+        * CMakeLists.txt:
+
 2011-02-06  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Andreas Kling.
 2011-02-06  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Andreas Kling.
index 5de532dd19a6c15d5453e6e83019c8590b0a3e76..db0650a4781f056a39542cd1b96a49127b4d7713 100644 (file)
@@ -57,7 +57,6 @@ IF (WTF_USE_CURL)
 ENDIF ()
 
 SET(WebKit_LIBRARIES
 ENDIF ()
 
 SET(WebKit_LIBRARIES
-    ${JavaScriptCore_LIBRARY_NAME}
     ${WebCore_LIBRARY_NAME}
 )
 
     ${WebCore_LIBRARY_NAME}
 )
 
@@ -67,6 +66,7 @@ INCLUDE_IF_EXISTS(${WEBKIT_DIR}/${WEBKIT_PORT_DIR}/CMakeLists${PORT}.txt)
 ADD_DEFINITIONS(-DBUILDING_WebKit)
 INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
 ADD_DEFINITIONS(-DBUILDING_WebKit)
 INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
 ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
+ADD_DEPENDENCIES(${WebKit_LIBRARY_NAME} ${WebCore_LIBRARY_NAME})
 TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
 
 IF (WebKit_LINK_FLAGS)
 TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
 
 IF (WebKit_LINK_FLAGS)
index 5fc8c3414febbd9b6b4a992ad12f7a0e45206012..3149b8b84c0d48e42dcbfd2186a905f41b58ccf3 100644 (file)
@@ -1,3 +1,17 @@
+2011-02-06  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Add dependencies for Visual Studio projects
+        https://bugs.webkit.org/show_bug.cgi?id=53773
+
+        Add a WebCore dependecy to WebKit, so CMake can 
+        generate the correct build order for the solution.
+
+        Remove JavaScriptCore dependecy, since WebCore already depends on it.
+
+        * CMakeLists.txt:
+
 2011-01-23  Mark Rowe  <mrowe@apple.com>
 
         Follow-up to r76477.
 2011-01-23  Mark Rowe  <mrowe@apple.com>
 
         Follow-up to r76477.
index 89f6b9787c8fbe40be9c03eb26b810ce90d2a126..7945dafa516507f6cdddb4917061c5acfa9cb2ae 100644 (file)
@@ -21,4 +21,5 @@ SET(WinCELauncher_LIBRARIES
 
 INCLUDE_DIRECTORIES(${WinCELauncher_INCLUDE_DIRECTORIES})
 ADD_EXECUTABLE(WinCELauncher ${WinCELauncher_SOURCES})
 
 INCLUDE_DIRECTORIES(${WinCELauncher_INCLUDE_DIRECTORIES})
 ADD_EXECUTABLE(WinCELauncher ${WinCELauncher_SOURCES})
+ADD_DEPENDENCIES(WinCELauncher ${WebKit_LIBRARY_NAME})
 TARGET_LINK_LIBRARIES(WinCELauncher ${WinCELauncher_LIBRARIES})
 TARGET_LINK_LIBRARIES(WinCELauncher ${WinCELauncher_LIBRARIES})
index 6ae58a52828588ef4fdb56c42558aa7d9360917c..5ca2904669b5c118f39cd48e4494c5726b8d96c0 100644 (file)
@@ -1,3 +1,15 @@
+2011-02-06  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Add dependencies for Visual Studio projects
+        https://bugs.webkit.org/show_bug.cgi?id=53773
+
+        Add a WebKit dependecy to WinCELauncher, so CMake can 
+        generate the correct build order for the solution.
+
+        * CMakeListsWinCE.txt:
+
 2011-02-06  Andreas Kling  <kling@webkit.org>
 
         Reviewed by Antonio Gomes.
 2011-02-06  Andreas Kling  <kling@webkit.org>
 
         Reviewed by Antonio Gomes.