Title: [198800] trunk/Source/WebCore
- Revision
- 198800
- Author
- achristen...@apple.com
- Date
- 2016-03-29 14:17:32 -0700 (Tue, 29 Mar 2016)
Log Message
Fix Windows build after r198777
* CMakeLists.txt:
* PlatformEfl.cmake:
WebCore_DERIVED_SOURCES should not be in WebCore_SOURCES. If it's needed for EFL,
then keep it in the EFL-specific platform.
* PlatformWin.cmake:
Make more derived sources in WebCore_DERIVED_SOURCES.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (198799 => 198800)
--- trunk/Source/WebCore/CMakeLists.txt 2016-03-29 21:06:56 UTC (rev 198799)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-03-29 21:17:32 UTC (rev 198800)
@@ -3809,8 +3809,6 @@
set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
list(APPEND WebCore_LIBRARIES WebCoreDerivedSources${DEBUG_SUFFIX})
-list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES})
-
WEBKIT_FRAMEWORK(WebCore)
# The -ftree-sra optimization (implicit with -O2) causes crashes when
Modified: trunk/Source/WebCore/ChangeLog (198799 => 198800)
--- trunk/Source/WebCore/ChangeLog 2016-03-29 21:06:56 UTC (rev 198799)
+++ trunk/Source/WebCore/ChangeLog 2016-03-29 21:17:32 UTC (rev 198800)
@@ -1,3 +1,14 @@
+2016-03-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows build after r198777
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ WebCore_DERIVED_SOURCES should not be in WebCore_SOURCES. If it's needed for EFL,
+ then keep it in the EFL-specific platform.
+ * PlatformWin.cmake:
+ Make more derived sources in WebCore_DERIVED_SOURCES.
+
2016-03-29 Saam barati <sbar...@apple.com>
Allow builtin JS functions to be intrinsics
Modified: trunk/Source/WebCore/PlatformEfl.cmake (198799 => 198800)
--- trunk/Source/WebCore/PlatformEfl.cmake 2016-03-29 21:06:56 UTC (rev 198799)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-03-29 21:17:32 UTC (rev 198800)
@@ -452,3 +452,5 @@
add_definitions(-DTEST_HYPHENATAION_PATH=\"${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Root/webkitgtk-test-dicts\")
endif ()
endif ()
+
+list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES})
Modified: trunk/Source/WebCore/PlatformWin.cmake (198799 => 198800)
--- trunk/Source/WebCore/PlatformWin.cmake 2016-03-29 21:06:56 UTC (rev 198799)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-03-29 21:17:32 UTC (rev 198800)
@@ -155,7 +155,7 @@
${WEBCORE_DIR}/css/themeWinQuirks.css
)
-list(APPEND WebCore_SOURCES
+list(APPEND WebCore_DERIVED_SOURCES
"${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
)
@@ -251,7 +251,7 @@
)
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
- list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj)
+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj
DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
