Make DLLLauncherMain executables dependent on dll
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Aug 2015 00:04:52 +0000 (00:04 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Aug 2015 00:04:52 +0000 (00:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148548

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

* shell/CMakeLists.txt:
* shell/PlatformWin.cmake:

Tools:

* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformWin.cmake:
* MiniBrowser/win/CMakeLists.txt:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformWin.cmake:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/CMakeLists.txt
Source/JavaScriptCore/shell/PlatformWin.cmake
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformWin.cmake
Tools/MiniBrowser/win/CMakeLists.txt
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformWin.cmake

index 46e394a..d86c5c3 100644 (file)
@@ -1,3 +1,13 @@
+2015-08-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <fpizlo@apple.com>
 
         DFG::StrCat isn't really effectful
index caab5c9..cbd29b2 100644 (file)
@@ -31,3 +31,7 @@ endif ()
 if (SHOULD_INSTALL_JS_SHELL)
     install(TARGETS jsc DESTINATION "${EXEC_INSTALL_DIR}")
 endif ()
+
+if (WIN32)
+    add_dependencies(jsc jscLib)
+endif ()
index 216efe9..0b5cc00 100644 (file)
@@ -1,13 +1,13 @@
 include_directories(./ ${JavaScriptCore_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 "JavaScriptCore")
-set_target_properties(jscdll PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
+target_link_libraries(jscLib ${JSC_LIBRARIES})
+set_target_properties(jscLib PROPERTIES FOLDER "JavaScriptCore")
+set_target_properties(jscLib PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
 
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DWIN_CAIRO)
index a462800..9131566 100644 (file)
@@ -1,3 +1,16 @@
+2015-08-27  Alex Christensen  <achristensen@webkit.org>
+
+        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  <lforschler@apple.com>
 
         Remove Mac slaves 188/189 after being replaced with 400/401.
index 5ece7a5..1baa510 100644 (file)
@@ -121,3 +121,7 @@ set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
 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 ()
index fd60575..e860096 100644 (file)
@@ -138,4 +138,6 @@ set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
 set_target_properties(ImageDiffLib PROPERTIES OUTPUT_NAME "ImageDiff")
 target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
 
+add_dependencies(ImageDiff ImageDiffLib)
+
 add_definitions(-D_UNICODE)
index 3951692..55b3a6b 100644 (file)
@@ -62,3 +62,5 @@ add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cp
 target_link_libraries(MiniBrowser shlwapi)
 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
 set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
+
+add_dependencies(MiniBrowser MiniBrowserLib)
index f6589bd..4ca072c 100644 (file)
@@ -168,6 +168,10 @@ add_executable(TestWTF
     ${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)
index 6bb5eae..ef59f39 100644 (file)
@@ -133,3 +133,6 @@ set_tests_properties(TestWebKit PROPERTIES TIMEOUT 60)
 set(test_main_SOURCES
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
 )
+
+add_dependencies(TestWebCore TestWebCoreLib)
+add_dependencies(TestWebKit TestWebKitLib)