Title: [260047] branches/safari-609-branch
- Revision
- 260047
- Author
- [email protected]
- Date
- 2020-04-13 15:43:55 -0700 (Mon, 13 Apr 2020)
Log Message
Cherry-pick r257595. rdar://problem/61735200
[Win] Fix AppleWin build
https://bugs.webkit.org/show_bug.cgi?id=208330
Reviewed by Don Olmstead.
Set framework headers directory for AppleWin build.
* Source/cmake/target/TargetJavaScriptCore.cmake:
* Source/cmake/target/TargetWTF.cmake:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/ChangeLog (260046 => 260047)
--- branches/safari-609-branch/ChangeLog 2020-04-13 22:41:54 UTC (rev 260046)
+++ branches/safari-609-branch/ChangeLog 2020-04-13 22:43:55 UTC (rev 260047)
@@ -1,3 +1,32 @@
+2020-04-13 Alan Coon <[email protected]>
+
+ Cherry-pick r257595. rdar://problem/61735200
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=208330
+
+ Reviewed by Don Olmstead.
+
+ Set framework headers directory for AppleWin build.
+
+ * Source/cmake/target/TargetJavaScriptCore.cmake:
+ * Source/cmake/target/TargetWTF.cmake:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@257595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-27 Per Arne Vollan <[email protected]>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=208330
+
+ Reviewed by Don Olmstead.
+
+ Set framework headers directory for AppleWin build.
+
+ * Source/cmake/target/TargetJavaScriptCore.cmake:
+ * Source/cmake/target/TargetWTF.cmake:
+
2020-02-28 Russell Epstein <[email protected]>
Cherry-pick r257288. rdar://problem/59908834
Modified: branches/safari-609-branch/Source/cmake/target/TargetJavaScriptCore.cmake (260046 => 260047)
--- branches/safari-609-branch/Source/cmake/target/TargetJavaScriptCore.cmake 2020-04-13 22:41:54 UTC (rev 260046)
+++ branches/safari-609-branch/Source/cmake/target/TargetJavaScriptCore.cmake 2020-04-13 22:43:55 UTC (rev 260047)
@@ -12,6 +12,9 @@
# Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
INTERFACE_LINK_LIBRARIES "WebKit::WTF;ICU::data;ICU::i18n;ICU::uc"
)
+ set(_javascript_Core_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core")
+ set(_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR ${_javascript_Core_FRAMEWORK_HEADERS_DIR})
+
target_include_directories(WebKit::_javascript_Core INTERFACE
${_javascript_Core_FRAMEWORK_HEADERS_DIR}
${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
Modified: branches/safari-609-branch/Source/cmake/target/TargetWTF.cmake (260046 => 260047)
--- branches/safari-609-branch/Source/cmake/target/TargetWTF.cmake 2020-04-13 22:41:54 UTC (rev 260046)
+++ branches/safari-609-branch/Source/cmake/target/TargetWTF.cmake 2020-04-13 22:43:55 UTC (rev 260047)
@@ -12,6 +12,7 @@
# Should add Apple::CoreFoundation here when https://bugs.webkit.org/show_bug.cgi?id=205085 lands
INTERFACE_LINK_LIBRARIES "ICU::data;ICU::i18n;ICU::uc"
)
+ set(WTF_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF")
target_include_directories(WebKit::WTF INTERFACE
${WTF_FRAMEWORK_HEADERS_DIR}
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
