Fix Windows build after r198777
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Mar 2016 21:17:32 +0000 (21:17 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Mar 2016 21:17:32 +0000 (21:17 +0000)
* 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.

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformWin.cmake

index 0419720..6517383 100644 (file)
@@ -3809,8 +3809,6 @@ set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerive
 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
index 707eb5d..d620ced 100644 (file)
@@ -1,3 +1,14 @@
+2016-03-29  Alex Christensen  <achristensen@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  <sbarati@apple.com>
 
         Allow builtin JS functions to be intrinsics
index 98c148d..c5dc8c6 100644 (file)
@@ -452,3 +452,5 @@ if (DEVELOPER_MODE)
         add_definitions(-DTEST_HYPHENATAION_PATH=\"${CMAKE_SOURCE_DIR}/WebKitBuild/DependenciesEFL/Root/webkitgtk-test-dicts\")
     endif ()
 endif ()
+
+list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES})
index 71561e2..dda7b69 100644 (file)
@@ -155,7 +155,7 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/css/themeWinQuirks.css
 )
 
-list(APPEND WebCore_SOURCES
+list(APPEND WebCore_DERIVED_SOURCES
     "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
 )
 
@@ -251,7 +251,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 )
 
 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