Title: [198804] trunk
- Revision
- 198804
- Author
- [email protected]
- Date
- 2016-03-29 15:15:27 -0700 (Tue, 29 Mar 2016)
Log Message
Fix Windows build.
Source/WebCore:
* CMakeLists.txt:
Tools:
* TestWebKitAPI/PlatformWin.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (198803 => 198804)
--- trunk/Source/WebCore/CMakeLists.txt 2016-03-29 22:11:24 UTC (rev 198803)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-03-29 22:15:27 UTC (rev 198804)
@@ -3788,7 +3788,7 @@
if (ENABLE_ALLINONE_BUILD)
message(STATUS "All-in-One DerivedSources build is enabled.")
- PROCESS_ALLINONE_FILE("${WebCore_SOURCES}" DerivedSources.cpp newSources TRUE)
+ PROCESS_ALLINONE_FILE("${WebCore_DERIVED_SOURCES}" DerivedSources.cpp newSources TRUE)
set(WebCore_DERIVED_SOURCES DerivedSources.cpp ${newSources})
endif ()
@@ -3806,7 +3806,9 @@
add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
-list(APPEND WebCore_LIBRARIES WebCoreDerivedSources${DEBUG_SUFFIX})
+if (NOT WIN32)
+ list(APPEND WebCore_LIBRARIES WebCoreDerivedSources${DEBUG_SUFFIX})
+endif ()
WEBKIT_FRAMEWORK(WebCore)
Modified: trunk/Source/WebCore/ChangeLog (198803 => 198804)
--- trunk/Source/WebCore/ChangeLog 2016-03-29 22:11:24 UTC (rev 198803)
+++ trunk/Source/WebCore/ChangeLog 2016-03-29 22:15:27 UTC (rev 198804)
@@ -1,5 +1,11 @@
2016-03-29 Alex Christensen <[email protected]>
+ Fix Windows build.
+
+ * CMakeLists.txt:
+
+2016-03-29 Alex Christensen <[email protected]>
+
Windows build fix.
* CMakeLists.txt:
Modified: trunk/Tools/ChangeLog (198803 => 198804)
--- trunk/Tools/ChangeLog 2016-03-29 22:11:24 UTC (rev 198803)
+++ trunk/Tools/ChangeLog 2016-03-29 22:15:27 UTC (rev 198804)
@@ -1,3 +1,9 @@
+2016-03-29 Alex Christensen <[email protected]>
+
+ Fix Windows build.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+
2016-03-29 Timothy Hatcher <[email protected]>
Update WebKit nightly to have a red needle to better match Safari
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (198803 => 198804)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-03-29 22:11:24 UTC (rev 198803)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2016-03-29 22:15:27 UTC (rev 198804)
@@ -32,6 +32,7 @@
Shlwapi
Usp10
WebCore${DEBUG_SUFFIX}
+ WebCoreDerivedSources${DEBUG_SUFFIX}
WebKit${DEBUG_SUFFIX}
gtest
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
