https://bugs.webkit.org/show_bug.cgi?id=154249
rdar://problem/
24644805
Reviewed by Chris Dumez.
Source/WebKit:
* PlatformWin.cmake:
Copy all generated headers to ForwardingHeaders/WebKit, not just WebKit.h.
This should fix problems related to not finding headers from other projects, such as AccessibleApplication.h.
WebKit.h, WebKitCOMAPI.h, and CFDictionaryPropertyBag.h were copied correctly, so this should copy the rest
of the needed headers.
Tools:
* DumpRenderTree/PlatformWin.cmake:
* MiniBrowser/win/CMakeLists.txt:
Don't include DerivedSources/WebKit/Interfaces to make MiniBrowser and DumpRenderTree
more like projects built internally after WebKit. They should only need to use what
is in ForwardingHeaders/WebKit.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196589
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2016-02-15 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build of projects built after WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=154249
+ rdar://problem/24644805
+
+ Reviewed by Chris Dumez.
+
+ * PlatformWin.cmake:
+ Copy all generated headers to ForwardingHeaders/WebKit, not just WebKit.h.
+ This should fix problems related to not finding headers from other projects, such as AccessibleApplication.h.
+ WebKit.h, WebKitCOMAPI.h, and CFDictionaryPropertyBag.h were copied correctly, so this should copy the rest
+ of the needed headers.
+
2016-02-12 Alex Christensen <achristensen@webkit.org>
Fix internal Windows WebKit debug build.
2016-02-12 Alex Christensen <achristensen@webkit.org>
Fix internal Windows WebKit debug build.
add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)
set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
-file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
+file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
set(WebKit_OUTPUT_NAME
add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
set(WebKit_OUTPUT_NAME
+2016-02-15 Alex Christensen <achristensen@webkit.org>
+
+ Fix internal Windows build of projects built after WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=154249
+ rdar://problem/24644805
+
+ Reviewed by Chris Dumez.
+
+ * DumpRenderTree/PlatformWin.cmake:
+ * MiniBrowser/win/CMakeLists.txt:
+ Don't include DerivedSources/WebKit/Interfaces to make MiniBrowser and DumpRenderTree
+ more like projects built internally after WebKit. They should only need to use what
+ is in ForwardingHeaders/WebKit.
+
2016-02-12 Nan Wang <n_wang@apple.com>
AX: Implement paragraph related text marker functions using TextIterator
2016-02-12 Nan Wang <n_wang@apple.com>
AX: Implement paragraph related text marker functions using TextIterator
TestNetscapePlugin/Tests
TestNetscapePlugin/win
TestNetscapePlugin/Tests/win
TestNetscapePlugin/Tests
TestNetscapePlugin/win
TestNetscapePlugin/Tests/win
- ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
)
list(APPEND DumpRenderTree_LIBRARIES
)
list(APPEND DumpRenderTree_LIBRARIES
../MiniBrowser.vcxproj
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
../MiniBrowser.vcxproj
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
- "${DERIVED_SOURCES_DIR}"
- "${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces"
"${WTF_DIR}"
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
"${WTF_DIR}"
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"