Title: [257595] trunk
Revision
257595
Author
pvol...@apple.com
Date
2020-02-27 15:45:15 -0800 (Thu, 27 Feb 2020)

Log Message

[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:

Modified Paths

Diff

Modified: trunk/ChangeLog (257594 => 257595)


--- trunk/ChangeLog	2020-02-27 23:42:28 UTC (rev 257594)
+++ trunk/ChangeLog	2020-02-27 23:45:15 UTC (rev 257595)
@@ -1,3 +1,15 @@
+2020-02-27  Per Arne Vollan  <pvol...@apple.com>
+
+        [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-27  Don Olmstead  <don.olmst...@sony.com>
 
         [CMake] Add WebKit::PAL target

Modified: trunk/Source/cmake/target/TargetJavaScriptCore.cmake (257594 => 257595)


--- trunk/Source/cmake/target/TargetJavaScriptCore.cmake	2020-02-27 23:42:28 UTC (rev 257594)
+++ trunk/Source/cmake/target/TargetJavaScriptCore.cmake	2020-02-27 23:45:15 UTC (rev 257595)
@@ -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: trunk/Source/cmake/target/TargetWTF.cmake (257594 => 257595)


--- trunk/Source/cmake/target/TargetWTF.cmake	2020-02-27 23:42:28 UTC (rev 257594)
+++ trunk/Source/cmake/target/TargetWTF.cmake	2020-02-27 23:45:15 UTC (rev 257595)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to