Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (189075 => 189076)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-28 00:04:52 UTC (rev 189076)
@@ -1,3 +1,13 @@
+2015-08-27 Alex Christensen <[email protected]>
+
+ Make DLLLauncherMain executables dependent on dll
+ https://bugs.webkit.org/show_bug.cgi?id=148548
+
+ Reviewed by Brent Fulgham.
+
+ * shell/CMakeLists.txt:
+ * shell/PlatformWin.cmake:
+
2015-08-27 Filip Pizlo <[email protected]>
DFG::StrCat isn't really effectful
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (189075 => 189076)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2015-08-28 00:04:52 UTC (rev 189076)
@@ -31,3 +31,7 @@
if (SHOULD_INSTALL_JS_SHELL)
install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}")
endif ()
+
+if (WIN32)
+ add_dependencies(jsc jscLib)
+endif ()
Modified: trunk/Source/_javascript_Core/shell/PlatformWin.cmake (189075 => 189076)
--- trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-08-28 00:04:52 UTC (rev 189076)
@@ -1,13 +1,13 @@
include_directories(./ ${_javascript_Core_INCLUDE_DIRECTORIES})
-add_library(jscdll SHARED ${JSC_SOURCES})
+add_library(jscLib SHARED ${JSC_SOURCES})
list(APPEND JSC_LIBRARIES
Winmm
)
-target_link_libraries(jscdll ${JSC_LIBRARIES})
-set_target_properties(jscdll PROPERTIES FOLDER "_javascript_Core")
-set_target_properties(jscdll PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
+target_link_libraries(jscLib ${JSC_LIBRARIES})
+set_target_properties(jscLib PROPERTIES FOLDER "_javascript_Core")
+set_target_properties(jscLib PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DWIN_CAIRO)
Modified: trunk/Tools/ChangeLog (189075 => 189076)
--- trunk/Tools/ChangeLog 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/ChangeLog 2015-08-28 00:04:52 UTC (rev 189076)
@@ -1,3 +1,16 @@
+2015-08-27 Alex Christensen <[email protected]>
+
+ Make DLLLauncherMain executables dependent on dll
+ https://bugs.webkit.org/show_bug.cgi?id=148548
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * MiniBrowser/win/CMakeLists.txt:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformWin.cmake:
+
2015-08-27 Lucas Forschler <[email protected]>
Remove Mac slaves 188/189 after being replaced with 400/401.
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (189075 => 189076)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-28 00:04:52 UTC (rev 189076)
@@ -121,3 +121,7 @@
add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
set_target_properties(TestNetscapePlugin PROPERTIES FOLDER "Tools")
+
+if (WIN32)
+ add_dependencies(DumpRenderTree DumpRenderTreeLib)
+endif ()
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (189075 => 189076)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-28 00:04:52 UTC (rev 189076)
@@ -138,4 +138,6 @@
set_target_properties(ImageDiffLib PROPERTIES OUTPUT_NAME "ImageDiff")
target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
+add_dependencies(ImageDiff ImageDiffLib)
+
add_definitions(-D_UNICODE)
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (189075 => 189076)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2015-08-28 00:04:52 UTC (rev 189076)
@@ -62,3 +62,5 @@
target_link_libraries(MiniBrowser shlwapi)
set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
+
+add_dependencies(MiniBrowser MiniBrowserLib)
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (189075 => 189076)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-28 00:04:52 UTC (rev 189076)
@@ -168,6 +168,10 @@
${TestWTF_SOURCES}
)
+if (WIN32)
+ add_dependencies(TestWTF TestWTFLib)
+endif ()
+
target_link_libraries(TestWTF ${test_wtf_LIBRARIES})
add_dependencies(TestWTF WTF ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
add_test(TestWTF ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF}/TestWTF)
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (189075 => 189076)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-27 23:59:57 UTC (rev 189075)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-28 00:04:52 UTC (rev 189076)
@@ -133,3 +133,6 @@
set(test_main_SOURCES
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
)
+
+add_dependencies(TestWebCore TestWebCoreLib)
+add_dependencies(TestWebKit TestWebKitLib)
